ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

wined3d: Add missing GL locking to d3dfmt_p8_upload_palette().

This commit is contained in:
Henri Verbeet 2009-05-14 19:40:55 +02:00 committed by Alexandre Julliard
parent 2a48ef1d09
commit 5bc449553b
1 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
dlls/wined3d/surface.c
View File

@ -2263,7 +2263,9 @@ static void d3dfmt_p8_upload_palette(IWineD3DSurface *iface, CONVERT_TYPES conve
if(GL_SUPPORT(EXT_PALETTED_TEXTURE)) if(GL_SUPPORT(EXT_PALETTED_TEXTURE))
{ {
TRACE("Using GL_EXT_PALETTED_TEXTURE for 8-bit paletted texture support\n"); TRACE("Using GL_EXT_PALETTED_TEXTURE for 8-bit paletted texture support\n");
ENTER_GL();
GL_EXTCALL(glColorTableEXT(This->glDescription.target,GL_RGBA,256,GL_RGBA,GL_UNSIGNED_BYTE, table)); GL_EXTCALL(glColorTableEXT(This->glDescription.target,GL_RGBA,256,GL_RGBA,GL_UNSIGNED_BYTE, table));
LEAVE_GL();
} }
else else
{ {
@ -2271,6 +2273,8 @@ static void d3dfmt_p8_upload_palette(IWineD3DSurface *iface, CONVERT_TYPES conve
* The 8bit pixel data will be used as an index in this palette texture to retrieve the final color. */ * The 8bit pixel data will be used as an index in this palette texture to retrieve the final color. */
TRACE("Using fragment shaders for emulating 8-bit paletted texture support\n"); TRACE("Using fragment shaders for emulating 8-bit paletted texture support\n");
ENTER_GL();
/* Create the fragment program if we don't have it */ /* Create the fragment program if we don't have it */
if(!device->paletteConversionShader) if(!device->paletteConversionShader)
{ {
@ -2310,6 +2314,8 @@ static void d3dfmt_p8_upload_palette(IWineD3DSurface *iface, CONVERT_TYPES conve
/* Rebind the texture because it isn't bound anymore */ /* Rebind the texture because it isn't bound anymore */
glBindTexture(This->glDescription.target, This->glDescription.textureName); glBindTexture(This->glDescription.target, This->glDescription.textureName);
LEAVE_GL();
} }
} }