diff options
| author | Brian Paul <brianp@vmware.com> | 2009-10-28 21:24:11 -0600 |
|---|---|---|
| committer | Brian Paul <brianp@vmware.com> | 2009-10-28 21:24:11 -0600 |
| commit | 1f196b786d6bd0c6a5dbdc638574ff716cc3d4de (patch) | |
| tree | 5ae2753b99070f8b35c51576bd39e52df63879d6 /src/mesa/state_tracker/st_texture.c | |
| parent | 0ea575d721821262a862ceef010db9b1a8b4a6d9 (diff) | |
| parent | 086f9fc0e2aef27f54eda87c733685500555bf20 (diff) | |
Merge branch 'texformat-rework'
Conflicts:
src/mesa/drivers/dri/radeon/radeon_fbo.c
src/mesa/drivers/dri/s3v/s3v_tex.c
src/mesa/drivers/dri/s3v/s3v_xmesa.c
src/mesa/drivers/dri/trident/trident_context.c
src/mesa/main/debug.c
src/mesa/main/mipmap.c
src/mesa/main/texformat.c
src/mesa/main/texgetimage.c
Diffstat (limited to 'src/mesa/state_tracker/st_texture.c')
| -rw-r--r-- | src/mesa/state_tracker/st_texture.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/mesa/state_tracker/st_texture.c b/src/mesa/state_tracker/st_texture.c index 3f30137747..3945822f66 100644 --- a/src/mesa/state_tracker/st_texture.c +++ b/src/mesa/state_tracker/st_texture.c @@ -32,8 +32,9 @@ #include "st_cb_fbo.h" #include "st_inlines.h" #include "main/enums.h" -#include "main/texobj.h" +#include "main/texfetch.h" #include "main/teximage.h" +#include "main/texobj.h" #include "main/texstore.h" #undef Elements /* fix re-defined macro warning */ @@ -128,7 +129,7 @@ st_texture_match_image(const struct pipe_texture *pt, /* Check if this image's format matches the established texture's format. */ - if (st_mesa_format_to_pipe_format(image->TexFormat->MesaFormat) != pt->format) + if (st_mesa_format_to_pipe_format(image->TexFormat) != pt->format) return GL_FALSE; /* Test if this image's size matches what's expected in the |