summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBrian Paul <brian.paul@tungstengraphics.com>2000-01-13 17:58:41 +0000
committerBrian Paul <brian.paul@tungstengraphics.com>2000-01-13 17:58:41 +0000
commit113edcc755cd6c86c7eba3929514f628d8c7c119 (patch)
tree51359e162d0f5f680df271a78a9622f9933716f4
parent4049cd35d89ad5eb29de15705ddc4190df5e8946 (diff)
added fxMesaContext arg to fxInitPixelTables()
-rw-r--r--src/mesa/drivers/glide/fxapi.c8
-rw-r--r--src/mesa/drivers/glide/fxdd.c4
-rw-r--r--src/mesa/drivers/glide/fxdrv.h3
3 files changed, 9 insertions, 6 deletions
diff --git a/src/mesa/drivers/glide/fxapi.c b/src/mesa/drivers/glide/fxapi.c
index 568b30b9a0..7a2272e652 100644
--- a/src/mesa/drivers/glide/fxapi.c
+++ b/src/mesa/drivers/glide/fxapi.c
@@ -973,7 +973,7 @@ fxMesaContext GLAPIENTRY fxMesaCreateContext(GLuint win,
/* Pixel tables are use during pixel read-back */
#if FXMESA_USE_ARGB
- fxInitPixelTables(GL_FALSE); /* Force RGB pixel order */
+ fxInitPixelTables(fxMesa, GL_FALSE); /* Force RGB pixel order */
#else
if (glbHWConfig.SSTs[glbCurrentBoard].type == GR_SSTTYPE_VOODOO) {
/* jk991130 - GROSS HACK!!! - Voodoo 3s don't use BGR!!
@@ -983,14 +983,14 @@ fxMesaContext GLAPIENTRY fxMesaCreateContext(GLuint win,
* Thanks to Joseph Kain for that one
*/
if (glbHWConfig.SSTs[glbCurrentBoard].sstBoard.VoodooConfig.nTexelfx == 2) {
- fxInitPixelTables(GL_FALSE); /* use RGB pixel order (Voodoo3) */
+ fxInitPixelTables(fxMesa, GL_FALSE); /* use RGB pixel order (Voodoo3) */
}
else {
- fxInitPixelTables(GL_TRUE); /* use BGR pixel order on Voodoo1/2 */
+ fxInitPixelTables(fxMesa, GL_TRUE); /* use BGR pixel order on Voodoo1/2 */
}
}
else {
- fxInitPixelTables(GL_FALSE); /* use RGB pixel order otherwise */
+ fxInitPixelTables(fxMesa, GL_FALSE); /* use RGB pixel order otherwise */
}
#endif
diff --git a/src/mesa/drivers/glide/fxdd.c b/src/mesa/drivers/glide/fxdd.c
index 0605ff4c47..71e11dfd14 100644
--- a/src/mesa/drivers/glide/fxdd.c
+++ b/src/mesa/drivers/glide/fxdd.c
@@ -70,9 +70,11 @@ GLubyte FX_PixelToB[0x10000];
* Initialize the FX_PixelTo{RGB} arrays.
* Input: bgrOrder - if TRUE, pixels are in BGR order, else RGB order.
*/
-void fxInitPixelTables(GLboolean bgrOrder)
+void fxInitPixelTables(fxMesaContext fxMesa, GLboolean bgrOrder)
{
GLuint pixel;
+
+ fxMesa->bgrOrder=bgrOrder;
for (pixel = 0; pixel <= 0xffff; pixel++) {
GLuint r, g, b;
if (bgrOrder) {
diff --git a/src/mesa/drivers/glide/fxdrv.h b/src/mesa/drivers/glide/fxdrv.h
index d4d3ca5913..c469daa670 100644
--- a/src/mesa/drivers/glide/fxdrv.h
+++ b/src/mesa/drivers/glide/fxdrv.h
@@ -438,6 +438,7 @@ struct tfxMesaContext {
GrBuffer_t currentFB;
+ GLboolean bgrOrder;
GrColor_t color;
GrColor_t clearC;
GrAlpha_t clearA;
@@ -672,6 +673,6 @@ extern void fxTMMoveInTM_NoLock(fxMesaContext fxMesa,
extern void fxSetupTexture_NoLock(GLcontext *ctx);
extern void fxSetupTexture(GLcontext *ctx);
-extern void fxInitPixelTables(GLboolean bgrOrder);
+extern void fxInitPixelTables(fxMesaContext fxMesa, GLboolean bgrOrder);
#endif