diff options
author | Brice Goglin <Brice.Goglin@ens-lyon.org> | 2007-04-20 18:44:59 +0200 |
---|---|---|
committer | Brice Goglin <Brice.Goglin@ens-lyon.org> | 2007-04-20 18:44:59 +0200 |
commit | e219bf8338ae31ddc4f5f02e088237d6cd5555a9 (patch) | |
tree | 601e47fedcee0b42da904ac440e611953e6d916e | |
parent | 6c0fba2480fa53fbb9cacb492143d39504441b6d (diff) |
Add 07_call_radeonSetCliprects_from_radeonMakeCurrent.patch
-rw-r--r-- | debian/changelog | 7 | ||||
-rw-r--r-- | debian/patches/07_call_radeonSetCliprects_from_radeonMakeCurrent.patch | 56 | ||||
-rw-r--r-- | debian/patches/series | 1 |
3 files changed, 64 insertions, 0 deletions
diff --git a/debian/changelog b/debian/changelog index c96993c2f5d..a1a5747de5c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +mesa (6.5.2-5) UNRELEASED; urgency=low + + * Add 07_call_radeonSetCliprects_from_radeonMakeCurrent.patch + (closes: #420164). Thanks to Christian Ohm. + + -- Brice Goglin <Brice.Goglin@ens-lyon.org> Fri, 20 Apr 2007 18:36:51 +0200 + mesa (6.5.2-4) unstable; urgency=low [ Julien Cristau ] diff --git a/debian/patches/07_call_radeonSetCliprects_from_radeonMakeCurrent.patch b/debian/patches/07_call_radeonSetCliprects_from_radeonMakeCurrent.patch new file mode 100644 index 00000000000..08f8f70bf9f --- /dev/null +++ b/debian/patches/07_call_radeonSetCliprects_from_radeonMakeCurrent.patch @@ -0,0 +1,56 @@ +From: Michel Dänzer <michel@tungstengraphics.com> +Date: Tue, 6 Mar 2007 12:22:35 +0000 (+0100) +Subject: r300: Call radeonSetCliprects from radeonMakeCurrent. +X-Git-Url: http://gitweb.freedesktop.org/?p=mesa/mesa.git;a=commitdiff;h=6f9b1afc862851532e4820705c412388b497ad58 + +r300: Call radeonSetCliprects from radeonMakeCurrent. + +Based on a patch by Panagiotis Papadakos. + +Among other things, this makes sure the framebuffer object associated with the +drawable has the correct size when _mesa_make_current is called, so the default +viewport is set up correctly. + +Also update radeon->lastStamp in radeonSetCliprects. +--- + +--- a/src/mesa/drivers/dri/r300/radeon_context.c ++++ b/src/mesa/drivers/dri/r300/radeon_context.c +@@ -51,6 +51,7 @@ WITH THE SOFTWARE OR THE USE OR OTHER DE + #include "radeon_macros.h" + #include "radeon_reg.h" + ++#include "radeon_state.h" + #include "r300_state.h" + + #include "utils.h" +@@ -279,6 +280,8 @@ GLboolean radeonMakeCurrent(__DRIcontext + + r300UpdateWindow(radeon->glCtx); + r300UpdateViewportOffset(radeon->glCtx); ++ ++ radeonSetCliprects(radeon); + } + + _mesa_make_current(radeon->glCtx, +--- a/src/mesa/drivers/dri/r300/radeon_lock.c ++++ b/src/mesa/drivers/dri/r300/radeon_lock.c +@@ -90,7 +90,6 @@ static void r300RegainedLock(radeonConte + #else + radeonUpdateScissor(radeon->glCtx); + #endif +- radeon->lastStamp = drawable->lastStamp; + } + + if (sarea->ctx_owner != radeon->dri.hwContext) { +--- a/src/mesa/drivers/dri/r300/radeon_state.c ++++ b/src/mesa/drivers/dri/r300/radeon_state.c +@@ -185,6 +185,8 @@ void radeonSetCliprects(radeonContextPtr + + if (radeon->state.scissor.enabled) + radeonRecalcScissorRects(radeon); ++ ++ radeon->lastStamp = drawable->lastStamp; + } + + diff --git a/debian/patches/series b/debian/patches/series index e4a761e6237..6bb18942ac9 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -5,3 +5,4 @@ 04_cleanup-osmesa-configs.patch 05_static-nonpic.patch 06_fix_texture_data_corruption.patch +07_call_radeonSetCliprects_from_radeonMakeCurrent.patch |