Mesa (texformat-rework): mesa: choose texture format in _mesa_get_fallback_texture()

Brian Paul brianp at kemper.freedesktop.org
Thu Oct 29 02:15:36 UTC 2009


Module: Mesa
Branch: texformat-rework
Commit: 7ac233ec15743763996e59c8b283f7c2e78a7210
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=7ac233ec15743763996e59c8b283f7c2e78a7210

Author: Brian Paul <brianp at vmware.com>
Date:   Wed Oct 28 19:33:48 2009 -0600

mesa: choose texture format in _mesa_get_fallback_texture()

---

 src/mesa/main/texobj.c |    5 +++++
 1 files changed, 5 insertions(+), 0 deletions(-)

diff --git a/src/mesa/main/texobj.c b/src/mesa/main/texobj.c
index 678845e..f69379d 100644
--- a/src/mesa/main/texobj.c
+++ b/src/mesa/main/texobj.c
@@ -33,6 +33,7 @@
 #include "context.h"
 #include "enums.h"
 #include "fbobject.h"
+#include "formats.h"
 #include "hash.h"
 #include "imports.h"
 #include "macros.h"
@@ -740,6 +741,10 @@ _mesa_get_fallback_texture(GLcontext *ctx)
       _mesa_init_teximage_fields(ctx, GL_TEXTURE_2D, texImage,
                                     8, 8, 1, 0, GL_RGBA); 
 
+      texImage->TexFormat =
+         ctx->Driver.ChooseTextureFormat(ctx, GL_RGBA, GL_RGBA, GL_UNSIGNED_BYTE);
+      ASSERT(texImage->TexFormat != MESA_FORMAT_NONE);
+
       /* set image data */
       ctx->Driver.TexImage2D(ctx, GL_TEXTURE_2D, 0, GL_RGBA,
                              8, 8, 0,




More information about the mesa-commit mailing list