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/drivers/dri/r600/r600_texstate.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/drivers/dri/r600/r600_texstate.c')
| -rw-r--r-- | src/mesa/drivers/dri/r600/r600_texstate.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/mesa/drivers/dri/r600/r600_texstate.c b/src/mesa/drivers/dri/r600/r600_texstate.c index 7d7e77d355b..55b455edc0c 100644 --- a/src/mesa/drivers/dri/r600/r600_texstate.c +++ b/src/mesa/drivers/dri/r600/r600_texstate.c @@ -591,7 +591,7 @@ void r600SetDepthTexMode(struct gl_texture_object *tObj) t = radeon_tex_obj(tObj); - r600GetTexFormat(tObj, tObj->Image[0][tObj->BaseLevel]->TexFormat->MesaFormat); + r600GetTexFormat(tObj, tObj->Image[0][tObj->BaseLevel]->TexFormat); } @@ -616,7 +616,7 @@ static void setup_hardware_state(context_t *rmesa, struct gl_texture_object *tex firstImage = t->base.Image[0][firstlevel]; if (!t->image_override) { - if (!r600GetTexFormat(texObj, firstImage->TexFormat->MesaFormat)) { + if (!r600GetTexFormat(texObj, firstImage->TexFormat)) { radeon_error("unexpected texture format in %s\n", __FUNCTION__); return; |