chacha/glide
1
0
Fork 0
Code Issues Pull Requests Actions Packages Releases Activity

remove irrelevant ssttype checks from individual hw code

Browse Source
This commit is contained in:
Ozkan Sezer
2021-11-11 17:37:50 +03:00
parent 587e01e573
commit 85186e0206
10 changed files with 23 additions and 127 deletions
Download Patch File Download Diff File Expand all files Collapse all files

91
glide3x/cvg/glide3/src/diget.c
View File

@@ -465,10 +465,7 @@ GR_DIENTRY(grGet, FxU32, (FxU32 pname, FxU32 plength, FxI32 *params))
break; break;
case GR_LFB_PIXEL_PIPE: case GR_LFB_PIXEL_PIPE:
if (plength == 4) { if (plength == 4) {
if (_GlideRoot.hwConfig.SSTs[_GlideRoot.current_sst].type == GR_SSTTYPE_Voodoo2) *params = FXTRUE;
*params = FXTRUE;
else
*params = FXFALSE;
retVal = plength; retVal = plength;
} }
break; break;
@@ -486,50 +483,19 @@ GR_DIENTRY(grGet, FxU32, (FxU32 pname, FxU32 plength, FxI32 *params))
break; break;
case GR_MEMORY_FB: case GR_MEMORY_FB:
if ((hwc) && (plength == 4)) { if ((hwc) && (plength == 4)) {
switch(hwc->SSTs[_GlideRoot.current_sst].type) { *params = hwc->SSTs[_GlideRoot.current_sst].sstBoard.VoodooConfig.fbRam << 20;
case GR_SSTTYPE_VOODOO:
case GR_SSTTYPE_Voodoo2:
*params = hwc->SSTs[_GlideRoot.current_sst].sstBoard.VoodooConfig.fbRam << 20;
break;
case GR_SSTTYPE_SST96:
*params = hwc->SSTs[_GlideRoot.current_sst].sstBoard.SST96Config.fbRam << 20;
break;
default:
*params = 0; /* XXX UMA architecture */
break;
}
retVal = plength; retVal = plength;
} }
break; break;
case GR_MEMORY_TMU: case GR_MEMORY_TMU:
if ((hwc) && (plength == 4)) { if ((hwc) && (plength == 4)) {
switch(hwc->SSTs[_GlideRoot.current_sst].type) { *params = hwc->SSTs[_GlideRoot.current_sst].sstBoard.VoodooConfig.tmuConfig[0].tmuRam << 20;
case GR_SSTTYPE_VOODOO:
case GR_SSTTYPE_Voodoo2:
*params = hwc->SSTs[_GlideRoot.current_sst].sstBoard.VoodooConfig.tmuConfig[0].tmuRam << 20;
break;
case GR_SSTTYPE_SST96:
*params = hwc->SSTs[_GlideRoot.current_sst].sstBoard.SST96Config.tmuConfig.tmuRam << 20;
break;
default:
*params = 0; /* XXX UMA architecture */
break;
}
retVal = plength; retVal = plength;
} }
break; break;
case GR_MEMORY_UMA: case GR_MEMORY_UMA:
if ((hwc) && (plength == 4)) { if ((hwc) && (plength == 4)) {
switch(hwc->SSTs[_GlideRoot.current_sst].type) { *params = 0; /* XXX non-UMA architecture */
case GR_SSTTYPE_VOODOO:
case GR_SSTTYPE_Voodoo2:
case GR_SSTTYPE_SST96:
*params = 0; /* XXX non-UMA architecture */
break;
default:
retVal = FXFALSE; /* XXX TBD */
break;
}
retVal = plength; retVal = plength;
} }
break; break;
@@ -573,35 +539,13 @@ GR_DIENTRY(grGet, FxU32, (FxU32 pname, FxU32 plength, FxI32 *params))
break; break;
case GR_REVISION_FB: case GR_REVISION_FB:
if ((hwc) && (plength == 4)) { if ((hwc) && (plength == 4)) {
switch(hwc->SSTs[_GlideRoot.current_sst].type) { *params = hwc->SSTs[_GlideRoot.current_sst].sstBoard.VoodooConfig.fbiRev;
case GR_SSTTYPE_VOODOO:
case GR_SSTTYPE_Voodoo2:
*params = hwc->SSTs[_GlideRoot.current_sst].sstBoard.VoodooConfig.fbiRev;
break;
case GR_SSTTYPE_SST96:
retVal = FXFALSE;
break;
default:
retVal = FXFALSE;
break;
}
retVal = plength; retVal = plength;
} }
break; break;
case GR_REVISION_TMU: case GR_REVISION_TMU:
if ((hwc) && (plength == 4)) { if ((hwc) && (plength == 4)) {
switch(hwc->SSTs[_GlideRoot.current_sst].type) { *params = hwc->SSTs[_GlideRoot.current_sst].sstBoard.VoodooConfig.tmuConfig[_GlideRoot.current_sst].tmuRev;
case GR_SSTTYPE_VOODOO:
case GR_SSTTYPE_Voodoo2:
*params = hwc->SSTs[_GlideRoot.current_sst].sstBoard.VoodooConfig.tmuConfig[_GlideRoot.current_sst].tmuRev;
break;
case GR_SSTTYPE_SST96:
*params = hwc->SSTs[_GlideRoot.current_sst].sstBoard.SST96Config.tmuConfig.tmuRev;
break;
default:
retVal = FXFALSE;
break;
}
retVal = plength; retVal = plength;
} }
break; break;
@@ -752,34 +696,17 @@ GR_DIENTRY(grGetString, const char *, (FxU32 pname))
switch(pname) { switch(pname) {
case GR_EXTENSION: case GR_EXTENSION:
switch(_GlideRoot.hwConfig.SSTs[_GlideRoot.current_sst].type) { return "CHROMARANGE TEXCHROMA TEXMIRROR PALETTE6666 FOGCOORD RESOLUTION";
case GR_SSTTYPE_Banshee:
case GR_SSTTYPE_Voodoo2:
return "CHROMARANGE TEXCHROMA TEXMIRROR PALETTE6666 FOGCOORD RESOLUTION";
break;
default:
return "";
break;
}
break;
case GR_HARDWARE: case GR_HARDWARE:
return "Voodoo2"; return "Voodoo2";
break;
case GR_RENDERER: case GR_RENDERER:
return "Glide"; return "Glide";
break;
case GR_VENDOR: case GR_VENDOR:
return "3Dfx Interactive"; return "3Dfx Interactive";
break;
case GR_VERSION: case GR_VERSION:
{ return VERSIONSTR;
return VERSIONSTR;
break;
}
default: default:
return "ERROR"; return "ERROR";
break;
} /* end switch */ } /* end switch */
#undef FN_NAME #undef FN_NAME
@@ -936,7 +863,6 @@ GR_DIENTRY(grGetProcAddress, GrProc, (char *procName))
#define FN_NAME "grGetProcAddress" #define FN_NAME "grGetProcAddress"
GrExtensionTuple *tuple; GrExtensionTuple *tuple;
if (_GlideRoot.hwConfig.SSTs[_GlideRoot.current_sst].type == GR_SSTTYPE_Voodoo2) {
if (!strcmp(procName, "grDrawTextureLineExt")) if (!strcmp(procName, "grDrawTextureLineExt"))
return (GrProc)_GlideRoot.deviceArchProcs.curLineProc; return (GrProc)_GlideRoot.deviceArchProcs.curLineProc;
@@ -948,7 +874,6 @@ GR_DIENTRY(grGetProcAddress, GrProc, (char *procName))
} }
tuple++; tuple++;
} }
}
return NULL; return NULL;
#undef FN_NAME #undef FN_NAME

5
glide3x/cvg/glide3/src/distate.c
View File

@@ -410,11 +410,6 @@ GR_DIENTRY(grChromaRange, void , (GrColor_t color, GrColor_t range, GrChromaRang
#define FN_NAME "grChromaRange" #define FN_NAME "grChromaRange"
GR_BEGIN_NOFIFOCHECK("grChromaRange\n",85); GR_BEGIN_NOFIFOCHECK("grChromaRange\n",85);
GR_CHECK_F(myName,
((_GlideRoot.hwConfig.SSTs[_GlideRoot.current_sst].type != GR_SSTTYPE_Voodoo2) &&
(_GlideRoot.hwConfig.SSTs[_GlideRoot.current_sst].type != GR_SSTTYPE_Banshee)),
"grChromaRange not supported.");
INVALIDATE(chromaKey); INVALIDATE(chromaKey);
INVALIDATE(chromaRange); INVALIDATE(chromaRange);

8
glide3x/cvg/glide3/src/gsst.c
View File

@@ -1408,11 +1408,12 @@ __errSliExit:
const GrHwConfiguration* hwConfig = &_GlideRoot.hwConfig; const GrHwConfiguration* hwConfig = &_GlideRoot.hwConfig;
FxU32 textureMode = (FxU32)SST_SEQ_8_DOWNLD; FxU32 textureMode = (FxU32)SST_SEQ_8_DOWNLD;
/*
if ((hwConfig->SSTs[_GlideRoot.current_sst].type == GR_SSTTYPE_VOODOO) && if ((hwConfig->SSTs[_GlideRoot.current_sst].type == GR_SSTTYPE_VOODOO) &&
(hwConfig->SSTs[_GlideRoot.current_sst].sstBoard.VoodooConfig.tmuConfig[tmu].tmuRev == 0)) { (hwConfig->SSTs[_GlideRoot.current_sst].sstBoard.VoodooConfig.tmuConfig[tmu].tmuRev == 0)) {
textureMode = 0; textureMode = 0;
} }
*/
gc->state.tmu_config[tmu].textureMode = textureMode; gc->state.tmu_config[tmu].textureMode = textureMode;
gc->state.tmu_config[tmu].tLOD = 0x00000000; gc->state.tmu_config[tmu].tLOD = 0x00000000;
gc->state.tmu_config[tmu].tDetail = 0x00000000; gc->state.tmu_config[tmu].tDetail = 0x00000000;
@@ -2005,11 +2006,6 @@ GR_ENTRY(guGammaCorrectionRGB, void, (float r, float g, float b))
GR_BEGIN_NOFIFOCHECK("guGammaCorrectionValue",80); GR_BEGIN_NOFIFOCHECK("guGammaCorrectionValue",80);
GDBG_INFO_MORE(gc->myLevel,"(%g %g %g)\n",r, g, b); GDBG_INFO_MORE(gc->myLevel,"(%g %g %g)\n",r, g, b);
GR_CHECK_F(myName,
(_GlideRoot.hwConfig.SSTs[_GlideRoot.current_sst].type != GR_SSTTYPE_Voodoo2)
|| (_GlideRoot.hwConfig.SSTs[_GlideRoot.current_sst].type != GR_SSTTYPE_Voodoo2),
"grGammaCorrectionRGB not supported.");
#if GLIDE_INIT_HAL #if GLIDE_INIT_HAL
fxHalInitGamma(hw, gamma); fxHalInitGamma(hw, gamma);
#else /* !GLIDE_INIT_HAL */ #else /* !GLIDE_INIT_HAL */

2
glide3x/h3/glide3/src/diget.c
View File

@@ -373,7 +373,7 @@ GR_DIENTRY(grGet, FxU32, (FxU32 pname, FxU32 plength, FxI32 *params))
break; break;
case GR_LFB_PIXEL_PIPE: case GR_LFB_PIXEL_PIPE:
if (plength == 4) { if (plength == 4) {
*params = (_GlideRoot.hwConfig.SSTs[_GlideRoot.current_sst].type != GR_SSTTYPE_SST96); *params = FXTRUE;
retVal = plength; retVal = plength;
} }
break; break;

6
glide3x/h3/glide3/src/distate.c
View File

@@ -442,12 +442,6 @@ GR_DIENTRY(grChromaRange, void , (GrColor_t color, GrColor_t range, GrChromaRang
#define FN_NAME "grChromaRange" #define FN_NAME "grChromaRange"
GR_BEGIN_NOFIFOCHECK("grChromaRange\n",85); GR_BEGIN_NOFIFOCHECK("grChromaRange\n",85);
GR_CHECK_F(myName,
((_GlideRoot.hwConfig.SSTs[_GlideRoot.current_sst].type != GR_SSTTYPE_Voodoo2) &&
(_GlideRoot.hwConfig.SSTs[_GlideRoot.current_sst].type != GR_SSTTYPE_Banshee) &&
(_GlideRoot.hwConfig.SSTs[_GlideRoot.current_sst].type != GR_SSTTYPE_Voodoo3)),
"grChromaRange not supported.");
INVALIDATE(chromaKey); INVALIDATE(chromaKey);
INVALIDATE(chromaRange); INVALIDATE(chromaRange);

8
glide3x/h3/glide3/src/glfb.c
View File

@@ -847,12 +847,14 @@ GR_ENTRY(grLfbWriteRegion, FxBool, (GrBuffer_t dst_buffer,
src_stride, src_data); src_stride, src_data);
#if defined(GLIDE3) && defined(GLIDE3_ALPHA) #if defined(GLIDE3) && defined(GLIDE3_ALPHA)
/*
if ((_GlideRoot.hwConfig.SSTs[_GlideRoot.current_sst].type == GR_SSTTYPE_SST96) && (pixelPipeline == FXTRUE)) if ((_GlideRoot.hwConfig.SSTs[_GlideRoot.current_sst].type == GR_SSTTYPE_SST96) && (pixelPipeline == FXTRUE))
rv = FXFALSE; rv = FXFALSE;
else else
rv = _grLfbWriteRegion(pixelPipeline, dst_buffer, dst_x, dst_y, */
src_format, src_width, src_height, rv = _grLfbWriteRegion(pixelPipeline, dst_buffer, dst_x, dst_y,
src_stride, src_data); src_format, src_width, src_height,
src_stride, src_data);
#else #else
rv = _grLfbWriteRegion(FXFALSE, dst_buffer, dst_x, dst_y, rv = _grLfbWriteRegion(FXFALSE, dst_buffer, dst_x, dst_y,
src_format, src_width, src_height, src_format, src_width, src_height,

2
glide3x/h5/glide3/src/diget.c
View File

@@ -527,7 +527,7 @@ GR_DIENTRY(grGet, FxU32, (FxU32 pname, FxU32 plength, FxI32 *params))
break; break;
case GR_LFB_PIXEL_PIPE: case GR_LFB_PIXEL_PIPE:
if (plength == 4) { if (plength == 4) {
*params = (_GlideRoot.hwConfig.SSTs[_GlideRoot.current_sst].type != GR_SSTTYPE_SST96); *params = FXTRUE;
retVal = plength; retVal = plength;
} }
break; break;

7
glide3x/h5/glide3/src/distate.c
View File

@@ -649,13 +649,6 @@ GR_DIENTRY(grChromaRange, void , (GrColor_t color, GrColor_t range, GrChromaRang
#define FN_NAME "grChromaRange" #define FN_NAME "grChromaRange"
GR_BEGIN_NOFIFOCHECK("grChromaRange\n",85); GR_BEGIN_NOFIFOCHECK("grChromaRange\n",85);
GR_CHECK_F(myName,
((_GlideRoot.hwConfig.SSTs[_GlideRoot.current_sst].type != GR_SSTTYPE_Voodoo2) &&
(_GlideRoot.hwConfig.SSTs[_GlideRoot.current_sst].type != GR_SSTTYPE_Banshee) &&
(_GlideRoot.hwConfig.SSTs[_GlideRoot.current_sst].type != GR_SSTTYPE_Voodoo3) &&
(_GlideRoot.hwConfig.SSTs[_GlideRoot.current_sst].type != GR_SSTTYPE_Voodoo4)),
"grChromaRange not supported.");
INVALIDATE(chromaKey); INVALIDATE(chromaKey);
INVALIDATE(chromaRange); INVALIDATE(chromaRange);

8
glide3x/h5/glide3/src/glfb.c
View File

@@ -2454,12 +2454,14 @@ GR_ENTRY(grLfbWriteRegion, FxBool, (GrBuffer_t dst_buffer,
src_stride, src_data); src_stride, src_data);
#if defined(GLIDE3) && defined(GLIDE3_ALPHA) #if defined(GLIDE3) && defined(GLIDE3_ALPHA)
/*
if ((_GlideRoot.hwConfig.SSTs[_GlideRoot.current_sst].type == GR_SSTTYPE_SST96) && (pixelPipeline == FXTRUE)) if ((_GlideRoot.hwConfig.SSTs[_GlideRoot.current_sst].type == GR_SSTTYPE_SST96) && (pixelPipeline == FXTRUE))
rv = FXFALSE; rv = FXFALSE;
else else
rv = _grLfbWriteRegion(pixelPipeline, dst_buffer, dst_x, dst_y, */
src_format, src_width, src_height, rv = _grLfbWriteRegion(pixelPipeline, dst_buffer, dst_x, dst_y,
src_stride, src_data); src_format, src_width, src_height,
src_stride, src_data);
#else #else
rv = _grLfbWriteRegion(FXFALSE, dst_buffer, dst_x, dst_y, rv = _grLfbWriteRegion(FXFALSE, dst_buffer, dst_x, dst_y,
src_format, src_width, src_height, src_format, src_width, src_height,

13
glide3x/sst1/glide3/src/diget.c
View File

@@ -498,7 +498,6 @@ GR_DIENTRY(grGet, FxU32, (FxU32 pname, FxU32 plength, FxI32 *params))
if ((hwc) && (plength == 4)) { if ((hwc) && (plength == 4)) {
switch(hwc->SSTs[_GlideRoot.current_sst].type) { switch(hwc->SSTs[_GlideRoot.current_sst].type) {
case GR_SSTTYPE_VOODOO: case GR_SSTTYPE_VOODOO:
case GR_SSTTYPE_Voodoo2:
*params = hwc->SSTs[_GlideRoot.current_sst].sstBoard.VoodooConfig.fbRam << 20; *params = hwc->SSTs[_GlideRoot.current_sst].sstBoard.VoodooConfig.fbRam << 20;
break; break;
case GR_SSTTYPE_SST96: case GR_SSTTYPE_SST96:
@@ -515,7 +514,6 @@ GR_DIENTRY(grGet, FxU32, (FxU32 pname, FxU32 plength, FxI32 *params))
if ((hwc) && (plength == 4)) { if ((hwc) && (plength == 4)) {
switch(hwc->SSTs[_GlideRoot.current_sst].type) { switch(hwc->SSTs[_GlideRoot.current_sst].type) {
case GR_SSTTYPE_VOODOO: case GR_SSTTYPE_VOODOO:
case GR_SSTTYPE_Voodoo2:
*params = hwc->SSTs[_GlideRoot.current_sst].sstBoard.VoodooConfig.tmuConfig[0].tmuRam << 20; *params = hwc->SSTs[_GlideRoot.current_sst].sstBoard.VoodooConfig.tmuConfig[0].tmuRam << 20;
break; break;
case GR_SSTTYPE_SST96: case GR_SSTTYPE_SST96:
@@ -530,16 +528,7 @@ GR_DIENTRY(grGet, FxU32, (FxU32 pname, FxU32 plength, FxI32 *params))
break; break;
case GR_MEMORY_UMA: case GR_MEMORY_UMA:
if ((hwc) && (plength == 4)) { if ((hwc) && (plength == 4)) {
switch(hwc->SSTs[_GlideRoot.current_sst].type) { *params = 0; /* XXX non-UMA architecture */
case GR_SSTTYPE_VOODOO:
case GR_SSTTYPE_Voodoo2:
case GR_SSTTYPE_SST96:
*params = 0; /* XXX non-UMA architecture */
break;
default:
retVal = FXFALSE; /* XXX TBD */
break;
}
retVal = plength; retVal = plength;
} }
break; break;