diff options
| author | Brian Paul <[email protected]> | 2009-09-30 20:28:45 -0600 |
|---|---|---|
| committer | Brian Paul <[email protected]> | 2009-09-30 20:28:45 -0600 |
| commit | 1f7c914ad0beea8a29c1a171c7cd1a12f2efe0fa (patch) | |
| tree | 1126fbf352c0f86b86afda83a7a0ca58e6243723 /src/mesa/swrast/s_triangle.c | |
| parent | e2e7bd6c1f979179e6840cf0e8db72fc72751650 (diff) | |
mesa: replace gl_texture_format with gl_format
Now gl_texture_image::TexFormat is a simple MESA_FORMAT_x enum.
ctx->Driver.ChooseTexture format also returns a MESA_FORMAT_x.
gl_texture_format will go away next.
Diffstat (limited to 'src/mesa/swrast/s_triangle.c')
| -rw-r--r-- | src/mesa/swrast/s_triangle.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/mesa/swrast/s_triangle.c b/src/mesa/swrast/s_triangle.c index 1ab0e19f922..7b59763f110 100644 --- a/src/mesa/swrast/s_triangle.c +++ b/src/mesa/swrast/s_triangle.c @@ -1055,11 +1055,11 @@ _swrast_choose_triangle( GLcontext *ctx ) const struct gl_texture_object *texObj2D; const struct gl_texture_image *texImg; GLenum minFilter, magFilter, envMode; - GLint format; + gl_format format; texObj2D = ctx->Texture.Unit[0].CurrentTex[TEXTURE_2D_INDEX]; texImg = texObj2D ? texObj2D->Image[0][texObj2D->BaseLevel] : NULL; - format = texImg ? texImg->TexFormat->MesaFormat : -1; + format = texImg ? texImg->TexFormat : -1; minFilter = texObj2D ? texObj2D->MinFilter : (GLenum) 0; magFilter = texObj2D ? texObj2D->MagFilter : (GLenum) 0; envMode = ctx->Texture.Unit[0].EnvMode; |