From 29ed8946338dde55e6a337dd9e64f6d003518ed3 Mon Sep 17 00:00:00 2001 From: Brian Paul Date: Thu, 2 Nov 2006 18:13:40 +0000 Subject: bump driver date --- src/mesa/drivers/dri/i915tex/intel_context.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/mesa/drivers/dri/i915tex/intel_context.c') diff --git a/src/mesa/drivers/dri/i915tex/intel_context.c b/src/mesa/drivers/dri/i915tex/intel_context.c index 3d51a6341c..cd725fc3e1 100644 --- a/src/mesa/drivers/dri/i915tex/intel_context.c +++ b/src/mesa/drivers/dri/i915tex/intel_context.c @@ -86,7 +86,7 @@ int INTEL_DEBUG = (0); #include "extension_helper.h" -#define DRIVER_DATE "20060929" +#define DRIVER_DATE "20061102" _glthread_Mutex lockMutex; static GLboolean lockMutexInit = GL_FALSE; -- cgit v1.2.3 From 51b115d5aec4ae7386d143f8bdd0289002802b7b Mon Sep 17 00:00:00 2001 From: Brian Paul Date: Thu, 2 Nov 2006 18:15:26 +0000 Subject: remove unneeded extern declaration of lockMutex --- src/mesa/drivers/dri/i915tex/intel_context.c | 3 --- 1 file changed, 3 deletions(-) (limited to 'src/mesa/drivers/dri/i915tex/intel_context.c') diff --git a/src/mesa/drivers/dri/i915tex/intel_context.c b/src/mesa/drivers/dri/i915tex/intel_context.c index cd725fc3e1..080ff10d88 100644 --- a/src/mesa/drivers/dri/i915tex/intel_context.c +++ b/src/mesa/drivers/dri/i915tex/intel_context.c @@ -655,9 +655,6 @@ intelContendedLock(struct intel_context *intel, GLuint flags) } -extern _glthread_Mutex lockMutex; - - /* Lock the hardware and validate our state. */ void LOCK_HARDWARE( struct intel_context *intel ) -- cgit v1.2.3 From df5edb21f8f01f8d3e9b87b8103685690b35646f Mon Sep 17 00:00:00 2001 From: Brian Paul Date: Thu, 2 Nov 2006 19:18:09 +0000 Subject: Fixes Glean vertex/fragment test failures. Those tests never called glViewport so the viewport was 0 by 0 pixels. --- src/mesa/drivers/dri/i915tex/intel_context.c | 10 ++++++++++ 1 file changed, 10 insertions(+) (limited to 'src/mesa/drivers/dri/i915tex/intel_context.c') diff --git a/src/mesa/drivers/dri/i915tex/intel_context.c b/src/mesa/drivers/dri/i915tex/intel_context.c index 080ff10d88..c77d365360 100644 --- a/src/mesa/drivers/dri/i915tex/intel_context.c +++ b/src/mesa/drivers/dri/i915tex/intel_context.c @@ -577,6 +577,16 @@ intelMakeCurrent(__DRIcontextPrivate * driContextPriv, } } + /* set initial GLframebuffer size to match window, if needed */ + if (drawFb->Width == 0 && driDrawPriv->w) { + _mesa_resize_framebuffer(&intel->ctx, drawFb, + driDrawPriv->w, driDrawPriv->h); + } + if (readFb->Width == 0 && driReadPriv->w) { + _mesa_resize_framebuffer(&intel->ctx, readFb, + driReadPriv->w, driReadPriv->h); + } + _mesa_make_current(&intel->ctx, drawFb, readFb); /* The drawbuffer won't always be updated by _mesa_make_current: -- cgit v1.2.3