norohind/kmscon
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

gl: add stride parameter to texture upload

Browse Source 
Allow to specify the stride when uploading data into a texture.

Signed-off-by: David Herrmann <dh.herrmann@googlemail.com>
This commit is contained in:
David Herrmann 2012-03-31 22:44:37 +02:00
parent f091b2b763
commit 728f4a1b18
3 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/font_freetype.c
View File

@ -133,7 +133,7 @@ static int kmscon_glyph_new(struct kmscon_glyph **out, kmscon_symbol_t key,
}
}
gl_tex_load(glyph->tex, bmap->width, bmap->rows, data);
gl_tex_load(glyph->tex, bmap->width, 0, bmap->rows, data);
free(data);
glyph->width = bmap->width;

2
src/gl.h
View File

@ -73,7 +73,7 @@ float *gl_m4_stack_tip(struct gl_m4_stack *stack);
unsigned int gl_tex_new();
void gl_tex_free(unsigned int tex);
void gl_tex_load(unsigned int tex, unsigned int width,
void gl_tex_load(unsigned int tex, unsigned int width, unsigned int stride,
unsigned int height, void *buf);
/*

4
src/gl_shader.c
View File

@ -98,7 +98,7 @@ void gl_tex_free(unsigned int tex)
glDeleteTextures(1, &tex);
}
void gl_tex_load(unsigned int tex, unsigned int width,
void gl_tex_load(unsigned int tex, unsigned int width, unsigned int stride,
unsigned int height, void *buf)
{
if (!buf || !width || !height)
@ -110,8 +110,10 @@ void gl_tex_load(unsigned int tex, unsigned int width,
*/
glBindTexture(GL_TEXTURE_2D, tex);
glPixelStorei(GL_UNPACK_ROW_LENGTH, stride);
glTexImage2D(GL_TEXTURE_2D, 0, GL_BGRA_EXT, width, height, 0,
GL_BGRA_EXT, GL_UNSIGNED_BYTE, buf);
glPixelStorei(GL_UNPACK_ROW_LENGTH, 0);
}
struct gl_shader {