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

- small TRACEing fix 

- fix bug in texture upload (I wonder how I missed this :-/ )
- improve the D3D1/2 texture mapping modes
This commit is contained in:
Lionel Ulmer 2003-06-04 23:38:22 +00:00 committed by Alexandre Julliard
parent ed88304868
commit 3f61d28661
2 changed files with 17 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
dlls/ddraw/d3ddevice/mesa.c
View File

@ -1833,7 +1833,7 @@ GL_IDirect3DDeviceImpl_7_3T_SetTextureStageState(LPDIRECT3DDEVICE7 iface,
} break; } break;
case D3DTSS_MAXMIPLEVEL: case D3DTSS_MAXMIPLEVEL:
TRACE(" Stage type : D3DTSS_MAXMIPLEVEL => 0 (disabled) \n"); TRACE(" Stage type : D3DTSS_MAXMIPLEVEL => %ld\n", dwState);
break; break;
case D3DTSS_BORDERCOLOR: case D3DTSS_BORDERCOLOR:

20
dlls/ddraw/mesa.c
View File

@ -244,19 +244,31 @@ void set_render_state(IDirect3DDeviceImpl* This,
convert_D3D_blendop_to_GL(lpStateBlock->render_state[D3DRENDERSTATE_DESTBLEND - 1])); convert_D3D_blendop_to_GL(lpStateBlock->render_state[D3DRENDERSTATE_DESTBLEND - 1]));
break; break;
case D3DRENDERSTATE_TEXTUREMAPBLEND: /* 21 */ case D3DRENDERSTATE_TEXTUREMAPBLEND: { /* 21 */
IDirect3DDevice7 *d3ddev = ICOM_INTERFACE(This, IDirect3DDevice7);
switch ((D3DTEXTUREBLEND) dwRenderState) { switch ((D3DTEXTUREBLEND) dwRenderState) {
case D3DTBLEND_DECAL: case D3DTBLEND_DECAL:
glTexEnvi(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
break;
case D3DTBLEND_DECALALPHA:
glTexEnvi(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_DECAL); glTexEnvi(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_DECAL);
break; break;
case D3DTBLEND_MODULATE: case D3DTBLEND_MODULATE:
glTexEnvi(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
break;
case D3DTBLEND_MODULATEALPHA: case D3DTBLEND_MODULATEALPHA:
glTexEnvi(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE); IDirect3DDevice7_SetTextureStageState(d3ddev, 0, D3DTSS_COLORARG1, D3DTA_TEXTURE);
IDirect3DDevice7_SetTextureStageState(d3ddev, 0, D3DTSS_ALPHAARG1, D3DTA_TEXTURE);
IDirect3DDevice7_SetTextureStageState(d3ddev, 0, D3DTSS_COLORARG2, D3DTA_CURRENT);
IDirect3DDevice7_SetTextureStageState(d3ddev, 0, D3DTSS_ALPHAARG2, D3DTA_CURRENT);
IDirect3DDevice7_SetTextureStageState(d3ddev, 0, D3DTSS_COLOROP, D3DTOP_MODULATE);
IDirect3DDevice7_SetTextureStageState(d3ddev, 0, D3DTSS_ALPHAOP, D3DTOP_MODULATE);
break; break;
default: default:
ERR("Unhandled texture environment %ld !\n",dwRenderState); ERR("Unhandled texture environment %ld !\n",dwRenderState);
} }
break; } break;
case D3DRENDERSTATE_CULLMODE: /* 22 */ case D3DRENDERSTATE_CULLMODE: /* 22 */
switch ((D3DCULL) dwRenderState) { switch ((D3DCULL) dwRenderState) {
@ -968,7 +980,7 @@ HRESULT upload_surface_to_tex_memory(RECT *rect, DWORD xoffset, DWORD yoffset, v
DWORD i; DWORD i;
WORD *src = (WORD *) (((BYTE *) src_d->lpSurface) + (bpp * rect->left) + (src_d->u1.lPitch * rect->top)), *dst; WORD *src = (WORD *) (((BYTE *) src_d->lpSurface) + (bpp * rect->left) + (src_d->u1.lPitch * rect->top)), *dst;
if (*temp_buffer != NULL) if (*temp_buffer == NULL)
*temp_buffer = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, *temp_buffer = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY,
current_tex_width * current_tex_height * sizeof(WORD)); current_tex_width * current_tex_height * sizeof(WORD));
dst = (WORD *) *temp_buffer; dst = (WORD *) *temp_buffer;