From 53391ac33f163e3b5a4946b35185dc3e9ef0f502 Mon Sep 17 00:00:00 2001 From: Jason Edmeades Date: Mon, 21 Apr 2003 22:37:48 +0000 Subject: [PATCH] DOT3 isn't there on earlier opengl versions. --- dlls/d3d8/device.c | 6 ++++-- dlls/d3d8/directx.c | 5 ++++- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/dlls/d3d8/device.c b/dlls/d3d8/device.c index 51530cd6602..1e575814988 100644 --- a/dlls/d3d8/device.c +++ b/dlls/d3d8/device.c @@ -3409,12 +3409,14 @@ HRESULT WINAPI IDirect3DDevice8Impl_SetTextureStageState(LPDIRECT3DDEVICE8 ifa break; case D3DTOP_DOTPRODUCT3 : +#if defined(GL_VERSION_1_3) if (This->isDot3) { glTexEnvi(GL_TEXTURE_ENV, Parm, GL_DOT3_RGBA); checkGLcall("glTexEnvi(GL_TEXTURE_ENV, comb_target, GL_DOT3_RGBA);"); - } else { - FIXME("DotProduct3 extension requested but not supported via this version of opengl\n"); + break; } +#endif + FIXME("DotProduct3 extension requested but not supported via this version of opengl\n"); break; case D3DTOP_SUBTRACT : diff --git a/dlls/d3d8/directx.c b/dlls/d3d8/directx.c index ce58064ac5b..404988087d8 100644 --- a/dlls/d3d8/directx.c +++ b/dlls/d3d8/directx.c @@ -351,7 +351,10 @@ HRESULT WINAPI IDirect3D8Impl_GetDeviceCaps (LPDIRECT3D8 iface, pCaps->TextureOpCaps = D3DTEXOPCAPS_ADD | D3DTEXOPCAPS_ADDSIGNED | D3DTEXOPCAPS_ADDSIGNED2X | D3DTEXOPCAPS_MODULATE | D3DTEXOPCAPS_MODULATE2X | D3DTEXOPCAPS_MODULATE4X | - D3DTEXOPCAPS_SELECTARG1 | D3DTEXOPCAPS_DOTPRODUCT3 | D3DTEXOPCAPS_DISABLE; + D3DTEXOPCAPS_SELECTARG1 | D3DTEXOPCAPS_DISABLE; +#if defined(GL_VERSION_1_3) + pCaps->TextureOpCaps |= D3DTEXOPCAPS_DOTPRODUCT3; +#endif /* FIXME: Add D3DTEXOPCAPS_ADDSMOOTH D3DTEXOPCAPS_BLENDCURRENTALPHA D3DTEXOPCAPS_BLENDDIFFUSEALPHA D3DTEXOPCAPS_BLENDFACTORALPHA D3DTEXOPCAPS_BLENDTEXTUREALPHA D3DTEXOPCAPS_BLENDTEXTUREALPHAPM D3DTEXOPCAPS_BUMPENVMAP D3DTEXOPCAPS_BUMPENVMAPLUMINANCE D3DTEXOPCAPS_LERP D3DTEXOPCAPS_MODULATEALPHA_ADDCOLOR D3DTEXOPCAPS_MODULATECOLOR_ADDALPHA