- GX_InitTexObjFilterMode / GX_InitTexObjWrapMode / GX_LoadTexObj at …

…more appropriate times
emukidid · Nov 28, 2017 · e4c1ce7 · e4c1ce7
1 parent 4b60b86
commit e4c1ce7
Show file tree

Hide file tree

Showing 4 changed files with 73 additions and 61 deletions.
diff --git a/PeopsGXGPU/cfg.c b/PeopsGXGPU/cfg.c
@@ -1252,7 +1252,7 @@ void ReadConfig(void)                                  // read config (linux fil
  bUseFrameSkip = frameSkip;
  fFrameRate=200.0f;
  iOffscreenDrawing=2;	//Standard - OK for most games
- bOpaquePass=FALSE;
+ bOpaquePass=TRUE;
  bUseAntiAlias=FALSE;
  iTexQuality=3;	//R8 G8 B8 A8 - Best colors, more ram needed
  iUseMask=0;

diff --git a/PeopsGXGPU/draw.c b/PeopsGXGPU/draw.c
@@ -249,7 +249,7 @@ void GetExtInfos(void)
       iClampType=GL_TO_EDGE_CLAMP;
  else 
 #endif
-  iClampType=GL_CLAMP;
+  iClampType=GX_CLAMP;
 
  glColorTableEXTEx=(PFNGLCOLORTABLEEXT)NULL;           // init ogl palette func pointer
 #ifndef __GX__
@@ -1388,6 +1388,8 @@ void assignTextureSprite(void)
 #ifndef __GX__
        glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST);
        glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
+#else
+       GX_InitTexObjFilterMode(&gTexName->GXtexObj,GX_NEAR,GX_NEAR);
 #endif
        gLastTex=gTexName;gLastFMode=0;
       }
@@ -1450,6 +1452,8 @@ void assignTexture3(void)
 #ifndef __GX__
        glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
        glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
+#else
+       GX_InitTexObjFilterMode(&gTexName->GXtexObj,GX_LINEAR,GX_LINEAR);
 #endif
        gLastTex=gTexName;gLastFMode=1;
       }
@@ -1522,6 +1526,8 @@ void assignTexture4(void)
 #ifndef __GX__
        glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
        glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
+#else
+       GX_InitTexObjFilterMode(&gTexName->GXtexObj,GX_LINEAR,GX_LINEAR);
 #endif
        gLastTex=gTexName;gLastFMode=1;
       }

diff --git a/PeopsGXGPU/prim.c b/PeopsGXGPU/prim.c
@@ -279,11 +279,9 @@ void PRIMdrawTexturedQuad(OGLVertex* vertex1, OGLVertex* vertex2,
 #else
 //SysPrintf("PRIMdrawTexturedQuad textured (%s)\r\n", (gTexName!=NULL?"YES":"NO"));
 //PrintVertexInfo(vertex1, vertex2, vertex3, vertex4);
- GX_InvalidateTexAll();
  GX_InvVtxCache();
  GX_ClearVtxDesc();
 
- GX_LoadTexObj(&gTexName->GXtexObj, GX_TEXMAP0);
  //set vertex description here
  GX_SetVtxDesc(GX_VA_POS, GX_DIRECT);
  GX_SetVtxDesc(GX_VA_TEX0, GX_DIRECT);
@@ -315,11 +313,9 @@ void PRIMdrawTexturedQuadCol0(OGLVertex* vertex1, OGLVertex* vertex2,
 
 //SysPrintf("PRIMdrawTexturedQuad textured (%s)\r\n", (gTexName!=NULL?"YES":"NO"));
 //PrintVertexInfo(vertex1, vertex2, vertex3, vertex4);
- GX_InvalidateTexAll();
  GX_InvVtxCache();
  GX_ClearVtxDesc();
 
- GX_LoadTexObj(&gTexName->GXtexObj, GX_TEXMAP0);
  //set vertex description here
  GX_SetVtxDesc(GX_VA_POS, GX_DIRECT);
  GX_SetVtxDesc(GX_VA_TEX0, GX_DIRECT);
@@ -370,11 +366,9 @@ void PRIMdrawTexturedTri(OGLVertex* vertex1, OGLVertex* vertex2,
  //SysPrintf("PRIMdrawTexturedTri textured (%s)\r\n", (gTexName!=NULL?"YES":"NO"));
  //PrintVertexInfo3(vertex1, vertex2, vertex3);
 
- GX_InvalidateTexAll();
  GX_InvVtxCache();
  GX_ClearVtxDesc();
 
- GX_LoadTexObj(&gTexName->GXtexObj, GX_TEXMAP0);
 
  Mtx GXmodelView2D;
  guMtxIdentity(GXmodelView2D);
@@ -421,11 +415,9 @@ void PRIMdrawTexGouraudTriColor(OGLVertex* vertex1, OGLVertex* vertex2,
  //SysPrintf("PRIMdrawTexGouraudTriColor textured (%s)\r\n", (gTexName!=NULL?"YES":"NO"));
  //PrintVertexInfo3(vertex1, vertex2, vertex3);
 
- GX_InvalidateTexAll();
  GX_InvVtxCache();
  GX_ClearVtxDesc();
 
- GX_LoadTexObj(&gTexName->GXtexObj, GX_TEXMAP0);
 
  Mtx GXmodelView2D;
  guMtxIdentity(GXmodelView2D);
@@ -480,11 +472,9 @@ void PRIMdrawTexGouraudTriColorQuad(OGLVertex* vertex1, OGLVertex* vertex2,
  //SysPrintf("PRIMdrawTexGouraudTriColorQuad textured (%s)\r\n", (gTexName!=NULL?"YES":"NO"));
  //PrintVertexInfo(vertex1, vertex2, vertex3, vertex4);
 
- GX_InvalidateTexAll();
  GX_InvVtxCache();
  GX_ClearVtxDesc();
 
- GX_LoadTexObj(&gTexName->GXtexObj, GX_TEXMAP0);
 
  Mtx GXmodelView2D;
  guMtxIdentity(GXmodelView2D);
@@ -1224,7 +1214,7 @@ void SetRenderMode(unsigned long DrawAttributes,BOOL bSCol)
 #else
    if(gTexName!=currTex)
     {
-     gTexName=currTex;
+     gTexName=currTex;GX_LoadTexObj(&gTexName->GXtexObj, GX_TEXMAP0);
     }
 #endif
 
@@ -1258,7 +1248,7 @@ void SetRenderMode(unsigned long DrawAttributes,BOOL bSCol)
    GX_SetNumTexGens (0);
    GX_SetTevOrder (GX_TEVSTAGE0, GX_TEXCOORDNULL, GX_TEXMAP_NULL, GX_COLOR0A0);
    GX_SetTevOp (GX_TEVSTAGE0, GX_PASSCLR);
-   //GX_InvalidateTexAll();
+   GX_InvalidateTexAll();
    bTexEnabled=FALSE;
   }     
 #endif