projects
/
mesa.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
mesa/drivers: use _mesa_get_format_bytes()
[mesa.git]
/
src
/
mesa
/
drivers
/
dri
/
mga
/
mga_texstate.c
diff --git
a/src/mesa/drivers/dri/mga/mga_texstate.c
b/src/mesa/drivers/dri/mga/mga_texstate.c
index d4c5b6fd97bf3f9dd6bee1d928fdb119946daa2e..8f78ab9bd4aaf33ad3f896e02e132591363fbe9b 100644
(file)
--- a/
src/mesa/drivers/dri/mga/mga_texstate.c
+++ b/
src/mesa/drivers/dri/mga/mga_texstate.c
@@
-131,7
+131,7
@@
mgaSetTexImages( mgaContextPtr mmesa,
break;
size = texImage->Width * texImage->Height *
break;
size = texImage->Width * texImage->Height *
-
baseImage->TexFormat->TexelBytes
;
+
_mesa_get_format_bytes(baseImage->TexFormat->MesaFormat)
;
t->offsets[i] = totalSize;
t->base.dirty_images[0] |= (1<<i);
t->offsets[i] = totalSize;
t->base.dirty_images[0] |= (1<<i);
@@
-206,8
+206,8
@@
static void mgaUpdateTextureEnvG200( GLcontext *ctx, GLuint unit )
mgaTextureObjectPtr t = (mgaTextureObjectPtr) tObj->DriverData;
GLenum format = tObj->Image[0][tObj->BaseLevel]->_BaseFormat;
mgaTextureObjectPtr t = (mgaTextureObjectPtr) tObj->DriverData;
GLenum format = tObj->Image[0][tObj->BaseLevel]->_BaseFormat;
- if (tObj != ctx->Texture.Unit[0].Current
2D
&&
- tObj != ctx->Texture.Unit[0].Current
Rect
)
+ if (tObj != ctx->Texture.Unit[0].Current
Tex[TEXTURE_2D_INDEX]
&&
+ tObj != ctx->Texture.Unit[0].Current
Tex[TEXTURE_RECT_INDEX]
)
return;
return;
@@
-635,8
+635,8
@@
static void mgaUpdateTextureEnvG400( GLcontext *ctx, GLuint unit )
mgaTextureObjectPtr t = (mgaTextureObjectPtr) tObj->DriverData;
GLenum format = tObj->Image[0][tObj->BaseLevel]->_BaseFormat;
mgaTextureObjectPtr t = (mgaTextureObjectPtr) tObj->DriverData;
GLenum format = tObj->Image[0][tObj->BaseLevel]->_BaseFormat;
- if (tObj != ctx->Texture.Unit[source].Current
2D
&&
- tObj != ctx->Texture.Unit[source].Current
Rect
)
+ if (tObj != ctx->Texture.Unit[source].Current
Tex[TEXTURE_2D_INDEX]
&&
+ tObj != ctx->Texture.Unit[source].Current
Tex[TEXTURE_RECT_INDEX]
)
return;
switch (ctx->Texture.Unit[source].EnvMode) {
return;
switch (ctx->Texture.Unit[source].EnvMode) {