diff options
author | reimar <reimar@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2008-09-20 17:48:01 +0000 |
---|---|---|
committer | reimar <reimar@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2008-09-20 17:48:01 +0000 |
commit | 0e99017da985eff9bf9b996ae1268794e6dfa770 (patch) | |
tree | 71259826b0349aae4ee31b6fd5670bee28f45c7a /libvo/vo_gl.c | |
parent | 2d4476731cfcc01df399835bd0c96864550ac009 (diff) | |
download | mpv-0e99017da985eff9bf9b996ae1268794e6dfa770.tar.bz2 mpv-0e99017da985eff9bf9b996ae1268794e6dfa770.tar.xz |
Change glCreateClearTex to use the same host data format as later uploads.
This fixes at least some of the massive performance problems the ATI drivers have.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27653 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libvo/vo_gl.c')
-rw-r--r-- | libvo/vo_gl.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/libvo/vo_gl.c b/libvo/vo_gl.c index b26e3c1855..7521b3e5ed 100644 --- a/libvo/vo_gl.c +++ b/libvo/vo_gl.c @@ -281,9 +281,9 @@ static void genEOSD(mp_eosd_images_t *imgs) { if (!largeeosdtex[0]) { glGenTextures(2, largeeosdtex); BindTexture(gl_target, largeeosdtex[0]); - glCreateClearTex(gl_target, GL_ALPHA, scale_type, 512, 512, 0); + glCreateClearTex(gl_target, GL_ALPHA, GL_ALPHA, GL_UNSIGNED_BYTE, scale_type, 512, 512, 0); BindTexture(gl_target, largeeosdtex[1]); - glCreateClearTex(gl_target, GL_ALPHA, scale_type, 512, 512, 0); + glCreateClearTex(gl_target, GL_ALPHA, GL_ALPHA, GL_UNSIGNED_BYTE, scale_type, 512, 512, 0); } for (i = img; i; i = i->next) { @@ -322,7 +322,7 @@ static void genEOSD(mp_eosd_images_t *imgs) { } else { texSize(i->w, i->h, &sx, &sy); BindTexture(gl_target, *curtex++); - glCreateClearTex(gl_target, GL_ALPHA, scale_type, sx, sy, 0); + glCreateClearTex(gl_target, GL_ALPHA, GL_ALPHA, GL_UNSIGNED_BYTE, scale_type, sx, sy, 0); } glUploadTex(gl_target, GL_ALPHA, GL_UNSIGNED_BYTE, i->bitmap, i->stride, x, y, i->w, i->h, 0); @@ -412,10 +412,10 @@ static int initGl(uint32_t d_width, uint32_t d_height) { BindTexture(GL_TEXTURE_3D, default_texs[i + 14]); } ActiveTexture(GL_TEXTURE1); - glCreateClearTex(gl_target, gl_texfmt, GL_LINEAR, + glCreateClearTex(gl_target, gl_texfmt, gl_format, gl_type, GL_LINEAR, texture_width / 2, texture_height / 2, 128); ActiveTexture(GL_TEXTURE2); - glCreateClearTex(gl_target, gl_texfmt, GL_LINEAR, + glCreateClearTex(gl_target, gl_texfmt, gl_format, gl_type, GL_LINEAR, texture_width / 2, texture_height / 2, 128); switch (use_yuv) { case YUV_CONVERSION_FRAGMENT_LOOKUP: @@ -433,7 +433,7 @@ static int initGl(uint32_t d_width, uint32_t d_height) { BindTexture(gl_target, 0); update_yuvconv(); } - glCreateClearTex(gl_target, gl_texfmt, GL_LINEAR, + glCreateClearTex(gl_target, gl_texfmt, gl_format, gl_type, GL_LINEAR, texture_width, texture_height, 0); resize(d_width, d_height); @@ -537,14 +537,14 @@ static void create_osd_texture(int x0, int y0, int w, int h, // create Textures for OSD part glGenTextures(1, &osdtex[osdtexCnt]); BindTexture(gl_target, osdtex[osdtexCnt]); - glCreateClearTex(gl_target, GL_LUMINANCE, scale_type, sx, sy, 0); + glCreateClearTex(gl_target, GL_LUMINANCE, GL_LUMINANCE, GL_UNSIGNED_BYTE, scale_type, sx, sy, 0); glUploadTex(gl_target, GL_LUMINANCE, GL_UNSIGNED_BYTE, src, stride, 0, 0, w, h, 0); #ifndef FAST_OSD glGenTextures(1, &osdatex[osdtexCnt]); BindTexture(gl_target, osdatex[osdtexCnt]); - glCreateClearTex(gl_target, GL_ALPHA, scale_type, sx, sy, 255); + glCreateClearTex(gl_target, GL_ALPHA, GL_ALPHA, GL_UNSIGNED_BYTE, scale_type, sx, sy, 255); { int i; char *tmp = malloc(stride * h); |