wined3d: Make the condition to enter p8 conversion shader path more strict.

This prevents shader path from being entered for an offscreen surface
when there is p8 render target and fixes failures in ddraw visual test
(with opengl rendering and RTL_READDRAW mode) and visual glitches in
Red Alert.
This commit is contained in:
Alexander Dorofeyev 2008-09-03 23:59:41 +03:00 committed by Alexandre Julliard
parent ec1ebfb136
commit 5c7f2906ee
1 changed files with 5 additions and 1 deletions

View File

@ -1533,7 +1533,11 @@ HRESULT d3dfmt_get_conv(IWineD3DSurfaceImpl *This, BOOL need_alpha_ck, BOOL use_
* 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) && primary_render_target_is_p8(device))) || colorkey_active || !use_texturing ) {
if( !(GL_SUPPORT(EXT_PALETTED_TEXTURE) ||
(GL_SUPPORT(ARB_FRAGMENT_PROGRAM) &&
device->render_targets &&
This == (IWineD3DSurfaceImpl*)device->render_targets[0])) ||
colorkey_active || !use_texturing ) {
*format = GL_RGBA;
*internal = GL_RGBA;
*type = GL_UNSIGNED_BYTE;