Module: Mesa
Branch: master
Commit: dc58da3e063d2a4018eea9149b43a3656a93a7ca
URL:    
http://cgit.freedesktop.org/mesa/mesa/commit/?id=dc58da3e063d2a4018eea9149b43a3656a93a7ca

Author: Eric Anholt <[email protected]>
Date:   Mon Dec 15 15:10:18 2008 -0800

intel: stub out CompressedTexSubImage2D instead of segfaulting.

---

 src/mesa/drivers/dri/intel/intel_tex.c          |    1 +
 src/mesa/drivers/dri/intel/intel_tex.h          |   10 ++++++++++
 src/mesa/drivers/dri/intel/intel_tex_subimage.c |   15 +++++++++++++++
 3 files changed, 26 insertions(+), 0 deletions(-)

diff --git a/src/mesa/drivers/dri/intel/intel_tex.c 
b/src/mesa/drivers/dri/intel/intel_tex.c
index 82f8b87..e64d8a1 100644
--- a/src/mesa/drivers/dri/intel/intel_tex.c
+++ b/src/mesa/drivers/dri/intel/intel_tex.c
@@ -231,6 +231,7 @@ intelInitTextureFuncs(struct dd_function_table *functions)
 
    /* compressed texture functions */
    functions->CompressedTexImage2D = intelCompressedTexImage2D;
+   functions->CompressedTexSubImage2D = intelCompressedTexSubImage2D;
    functions->GetCompressedTexImage = intelGetCompressedTexImage;
 
    functions->NewTextureObject = intelNewTextureObject;
diff --git a/src/mesa/drivers/dri/intel/intel_tex.h 
b/src/mesa/drivers/dri/intel/intel_tex.h
index 6219c1c..742ccc0 100644
--- a/src/mesa/drivers/dri/intel/intel_tex.h
+++ b/src/mesa/drivers/dri/intel/intel_tex.h
@@ -130,6 +130,16 @@ void intelCompressedTexImage2D( GLcontext *ctx, GLenum 
target, GLint level,
                                struct gl_texture_object *texObj,
                                struct gl_texture_image *texImage );
 
+void intelCompressedTexSubImage2D(GLcontext * ctx,
+                                 GLenum target,
+                                 GLint level,
+                                 GLint xoffset, GLint yoffset,
+                                 GLsizei width, GLsizei height,
+                                 GLenum format, GLsizei imageSize,
+                                 const GLvoid * pixels,
+                                 struct gl_texture_object *texObj,
+                                 struct gl_texture_image *texImage);
+
 void intelGetCompressedTexImage(GLcontext *ctx, GLenum target, GLint level,
                                GLvoid *pixels,
                                struct gl_texture_object *texObj,
diff --git a/src/mesa/drivers/dri/intel/intel_tex_subimage.c 
b/src/mesa/drivers/dri/intel/intel_tex_subimage.c
index b752361..f86de56 100644
--- a/src/mesa/drivers/dri/intel/intel_tex_subimage.c
+++ b/src/mesa/drivers/dri/intel/intel_tex_subimage.c
@@ -184,3 +184,18 @@ intelTexSubImage1D(GLcontext * ctx,
                     format, type, pixels, packing, texObj, texImage);
 
 }
+
+void
+intelCompressedTexSubImage2D(GLcontext * ctx,
+                            GLenum target,
+                            GLint level,
+                            GLint xoffset, GLint yoffset,
+                            GLsizei width, GLsizei height,
+                            GLenum format, GLsizei imageSize,
+                            const GLvoid * pixels,
+                            struct gl_texture_object *texObj,
+                            struct gl_texture_image *texImage)
+{
+   fprintf(stderr, "stubbed CompressedTexSubImage2D: %d...@%dx%d\n",
+          width, height, xoffset, yoffset);
+}

_______________________________________________
mesa-commit mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/mesa-commit

Reply via email to