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

wined3d: Use software palette conversion for non-texturing operations.

This commit is contained in:
Roderick Colenbrander 2008-01-07 13:43:48 +01:00 committed by Alexandre Julliard
parent a34bd3b2cd
commit f2e32f7c45
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
dlls/wined3d/surface.c
View File

@ -1390,11 +1390,14 @@ HRESULT d3dfmt_get_conv(IWineD3DSurfaceImpl *This, BOOL need_alpha_ck, BOOL use_
p8_render_target = TRUE; p8_render_target = TRUE;
} }
/* Use conversion when the paletted texture extension is not available, or when it is available make sure it is used /* Use conversion when the paletted texture extension OR fragment shaders are available. When either
* for texturing as it won't work for calls like glDraw-/glReadPixels and further also use conversion in case of color keying. * of the two is available make sure texturing is requested as neither of the two works in
* Paletted textures can be emulated using shaders but only do that for 2D purposes e.g. situations in which the main render target uses p8. Some games like GTA Vice City use P8 for texturing which conflicts with this. * conjunction with calls like glDraw-/glReadPixels. Further also use conversion in case of color keying.
* Paletted textures can be emulated using shaders but only do that for 2D purposes e.g. situations
* in which the main render target uses p8. Some games like GTA Vice City use P8 for texturing which
* conflicts with this.
*/ */
if( !(GL_SUPPORT(EXT_PALETTED_TEXTURE) || (GL_SUPPORT(ARB_FRAGMENT_PROGRAM) && p8_render_target)) || colorkey_active || (!use_texturing && GL_SUPPORT(EXT_PALETTED_TEXTURE)) ) { if( !(GL_SUPPORT(EXT_PALETTED_TEXTURE) || (GL_SUPPORT(ARB_FRAGMENT_PROGRAM) && p8_render_target)) || colorkey_active || !use_texturing ) {
*format = GL_RGBA; *format = GL_RGBA;
*internal = GL_RGBA; *internal = GL_RGBA;
*type = GL_UNSIGNED_BYTE; *type = GL_UNSIGNED_BYTE;