From f1381880a8e0e0cdd96c4c725ff35a28b250b09d Mon Sep 17 00:00:00 2001 From: Chia-I Wu Date: Tue, 27 Apr 2010 23:19:27 +0800 Subject: glapi: Fix loading of old DRI drivers. The removal of _glapi_noop_enable_warnings and _glapi_set_warning_func in e4f168a6f4911a096be97d2e83ef8ad9c5862ec0 prevents DRI drivers built before the commit from loading. Add stub versions of the functions to make them load again. --- src/mesa/glapi/glapi_nop.c | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) (limited to 'src/mesa') diff --git a/src/mesa/glapi/glapi_nop.c b/src/mesa/glapi/glapi_nop.c index df9c587284..4257b1fbce 100644 --- a/src/mesa/glapi/glapi_nop.c +++ b/src/mesa/glapi/glapi_nop.c @@ -48,6 +48,26 @@ #include "glapi/glapi.h" + +/* + * These stubs are kept so that the old DRI drivers still load. + */ +PUBLIC void +_glapi_noop_enable_warnings(GLboolean enable); + +PUBLIC void +_glapi_set_warning_func(_glapi_proc func); + +void +_glapi_noop_enable_warnings(GLboolean enable) +{ +} + +void +_glapi_set_warning_func(_glapi_proc func) +{ +} + #ifdef DEBUG /** -- cgit v1.2.3 From 717e86738f82d5c7d7de39fbd85734febfd4c66a Mon Sep 17 00:00:00 2001 From: Pierre Willenbrock Date: Tue, 27 Apr 2010 14:16:48 -0700 Subject: mesa: Don't set srcLevel on GL_TEXTURE_RECTANGLE_ARB targets Signed-off-by: Brian Paul --- src/mesa/drivers/common/meta.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) (limited to 'src/mesa') diff --git a/src/mesa/drivers/common/meta.c b/src/mesa/drivers/common/meta.c index b97b760f18..d0b5cb55cd 100644 --- a/src/mesa/drivers/common/meta.c +++ b/src/mesa/drivers/common/meta.c @@ -1112,8 +1112,10 @@ blitframebuffer_texture(GLcontext *ctx, _mesa_BindTexture(target, texObj->Name); _mesa_TexParameteri(target, GL_TEXTURE_MIN_FILTER, filter); _mesa_TexParameteri(target, GL_TEXTURE_MAG_FILTER, filter); - _mesa_TexParameteri(target, GL_TEXTURE_BASE_LEVEL, srcLevel); - _mesa_TexParameteri(target, GL_TEXTURE_MAX_LEVEL, srcLevel); + if (target != GL_TEXTURE_RECTANGLE_ARB) { + _mesa_TexParameteri(target, GL_TEXTURE_BASE_LEVEL, srcLevel); + _mesa_TexParameteri(target, GL_TEXTURE_MAX_LEVEL, srcLevel); + } _mesa_TexParameteri(target, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE); _mesa_TexParameteri(target, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE); _mesa_TexEnvi(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); @@ -1171,8 +1173,10 @@ blitframebuffer_texture(GLcontext *ctx, */ _mesa_TexParameteri(target, GL_TEXTURE_MIN_FILTER, minFilterSave); _mesa_TexParameteri(target, GL_TEXTURE_MAG_FILTER, magFilterSave); - _mesa_TexParameteri(target, GL_TEXTURE_BASE_LEVEL, baseLevelSave); - _mesa_TexParameteri(target, GL_TEXTURE_MAX_LEVEL, maxLevelSave); + if (target != GL_TEXTURE_RECTANGLE_ARB) { + _mesa_TexParameteri(target, GL_TEXTURE_BASE_LEVEL, baseLevelSave); + _mesa_TexParameteri(target, GL_TEXTURE_MAX_LEVEL, maxLevelSave); + } _mesa_TexParameteri(target, GL_TEXTURE_WRAP_S, wrapSSave); _mesa_TexParameteri(target, GL_TEXTURE_WRAP_T, wrapTSave); -- cgit v1.2.3 From c0b41116f1e7e8e7ebe5e0bc5b790ae7842f09d4 Mon Sep 17 00:00:00 2001 From: Pierre Willenbrock Date: Tue, 27 Apr 2010 14:16:49 -0700 Subject: mesa: Disable scissor when begining meta operations Signed-off-by: Brian Paul --- src/mesa/drivers/common/meta.c | 1 + 1 file changed, 1 insertion(+) (limited to 'src/mesa') diff --git a/src/mesa/drivers/common/meta.c b/src/mesa/drivers/common/meta.c index d0b5cb55cd..3d2183c618 100644 --- a/src/mesa/drivers/common/meta.c +++ b/src/mesa/drivers/common/meta.c @@ -424,6 +424,7 @@ _mesa_meta_begin(GLcontext *ctx, GLbitfield state) if (state & META_SCISSOR) { save->Scissor = ctx->Scissor; /* struct copy */ + _mesa_set_enable(ctx, GL_SCISSOR_TEST, GL_FALSE); } if (state & META_SHADER) { -- cgit v1.2.3