- Initialize the texture state information.

- Add dummy textures so texture operations which dont reference the texture can work. - Support 2d and 3d textures properly. - Reapply the texture state information as textures get set, as opengl stores the state along with the bound texture whereas directx uses the current state information during the draw stage. - 3rd attempt to sort out lighting, for programs which dont set normals. - Temporarily silence some unnecessary fixmes.

- Initialize the texture state information.
ec7155b6 · Jason Edmeades · Alexandre Julliard · 58038199 · ec7155b6 · ec7155b6
Commit ec7155b6 authored Oct 28, 2002 by Jason Edmeades Committed by Alexandre Julliard Oct 28, 2002
Expand all Hide whitespace changes
Inline Side-by-side

Showing with 8 additions and 13 deletions

d3d8_private.h dlls/d3d8/d3d8_private.h +4 -0

device.c dlls/d3d8/device.c +0 -0

directx.c dlls/d3d8/directx.c +4 -13

No files found.
--- a/dlls/d3d8/d3d8_private.h
+++ b/dlls/d3d8/d3d8_private.h
@@ -133,6 +133,7 @@ typedef struct STATEBLOCK {

    /* Texture */
    IDirect3DBaseTexture8    *textures[8];
+    int                       textureDimensions[8];

    /* Texture State Stage */
    DWORD                     texture_state[8][HIGHEST_TEXTURE_STATE];
@@ -310,6 +311,9 @@ struct IDirect3DDevice8Impl
    Display     *display;
    Window       win;

+    void        *dummyTexture[8];
+    UINT         dummyTextureName[8];
+
 };

 /* IUnknown: */

--- a/dlls/d3d8/device.c
+++ b/dlls/d3d8/device.c
--- a/dlls/d3d8/directx.c
+++ b/dlls/d3d8/directx.c
@@ -31,13 +31,6 @@

 WINE_DEFAULT_DEBUG_CHANNEL(d3d);

-static const float idmatrix[16] = {
-    1.0, 0.0, 0.0, 0.0,
-    0.0, 1.0, 0.0, 0.0,
-    0.0, 0.0, 1.0, 0.0,
-    0.0, 0.0, 0.0, 1.0
-};
-
 #define NUM_MODES 10
 static const int modes[NUM_MODES][3] = {
    {640, 480, 85},
@@ -405,15 +398,10 @@ HRESULT  WINAPI  IDirect3D8Impl_CreateDevice               (LPDIRECT3D8 iface,
    object->CreateParms.hFocusWindow = hFocusWindow;
    object->CreateParms.BehaviorFlags = BehaviourFlags;

-    CreateStateBlock((LPDIRECT3DDEVICE8) object);
-
    *ppReturnedDeviceInterface = (LPDIRECT3DDEVICE8)object;

    /* Initialize settings */
    memcpy(&object->PresentParms, pPresentationParameters, sizeof(D3DPRESENT_PARAMETERS));
-    memcpy(&object->StateBlock.transforms[D3DTS_WORLDMATRIX(0)], &idmatrix, sizeof(idmatrix));
-    memcpy(&object->StateBlock.transforms[D3DTS_PROJECTION], &idmatrix, sizeof(idmatrix));
-    memcpy(&object->StateBlock.transforms[D3DTS_VIEW], &idmatrix, sizeof(idmatrix));

    object->PresentParms.BackBufferCount = 1; /* Opengl only supports one? */
    pPresentationParameters->BackBufferCount = 1;
@@ -517,6 +505,9 @@ HRESULT  WINAPI  IDirect3D8Impl_CreateDevice               (LPDIRECT3D8 iface,
    glTexEnvf( GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_COMBINE_EXT);
    checkGLcall("glTexEnvf( GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_COMBINE_EXT);");

+    /* Setup all the devices defaults */
+    CreateStateBlock((LPDIRECT3DDEVICE8) object);
+
    LEAVE_GL();

    { /* Set a default viewport */
@@ -530,7 +521,7 @@ HRESULT  WINAPI  IDirect3D8Impl_CreateDevice               (LPDIRECT3D8 iface,
       IDirect3DDevice8Impl_SetViewport((LPDIRECT3DDEVICE8) object, &vp);
    }

-    TRACE("(%p,%d) incomplete\n", This, Adapter);
+    TRACE("(%p,%d)\n", This, Adapter);
    return D3D_OK;
 }