summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorKeith Whitwell <keith@tungstengraphics.com>2006-02-13 00:39:20 +0000
committerKeith Whitwell <keith@tungstengraphics.com>2006-02-13 00:39:20 +0000
commit67ff8b354e26dea9caa3b754a078272a105f0bd4 (patch)
tree8b7cf94f2253f7d4220d88abb42d37ed72d9c498 /src
parent08e795757180ec15b581b487fcb135c2e0938eb1 (diff)
bump driver date, etc
Diffstat (limited to 'src')
-rw-r--r--src/mesa/drivers/dri/i915/i915_context.c2
-rw-r--r--src/mesa/drivers/dri/i915/intel_context.c2
-rw-r--r--src/mesa/drivers/dri/i915/intel_tex_subimage.c1
3 files changed, 3 insertions, 2 deletions
diff --git a/src/mesa/drivers/dri/i915/i915_context.c b/src/mesa/drivers/dri/i915/i915_context.c
index f1c4105ea4d..f1b11bf95b1 100644
--- a/src/mesa/drivers/dri/i915/i915_context.c
+++ b/src/mesa/drivers/dri/i915/i915_context.c
@@ -110,7 +110,7 @@ GLboolean i915CreateContext( const __GLcontextModes *mesaVis,
if (!i915) return GL_FALSE;
- _mesa_printf( "\ntexmem branch (i915)\n\n");
+ _mesa_printf( "\ntexmem branch (i915, drop2)\n\n");
i915InitVtbl( i915 );
diff --git a/src/mesa/drivers/dri/i915/intel_context.c b/src/mesa/drivers/dri/i915/intel_context.c
index 967cb9bf698..53b28a8a6be 100644
--- a/src/mesa/drivers/dri/i915/intel_context.c
+++ b/src/mesa/drivers/dri/i915/intel_context.c
@@ -93,7 +93,7 @@ int prevLockLine;
* Mesa's Driver Functions
***************************************/
-#define DRIVER_DATE "20060201"
+#define DRIVER_DATE "20060212"
const GLubyte *intelGetString( GLcontext *ctx, GLenum name )
{
diff --git a/src/mesa/drivers/dri/i915/intel_tex_subimage.c b/src/mesa/drivers/dri/i915/intel_tex_subimage.c
index e254ef394ef..c065e0c630d 100644
--- a/src/mesa/drivers/dri/i915/intel_tex_subimage.c
+++ b/src/mesa/drivers/dri/i915/intel_tex_subimage.c
@@ -74,6 +74,7 @@ static void intelTexSubimage (GLcontext *ctx,
intelImage->level,
&dstRowStride );
+ assert(dstRowStride);
if (!texImage->TexFormat->StoreImage(ctx, dims, texImage->_BaseFormat,
texImage->TexFormat,