Mesa-master:

- add some patches from fedora-rawhide
This commit is contained in:
Stephan Raue 2009-09-23 06:21:37 +02:00
parent 5b2928ca6c
commit 63054a32c8
2 changed files with 43 additions and 0 deletions

View File

@ -0,0 +1,12 @@
diff -up mesa-20090813/src/mesa/drivers/dri/common/vblank.c.jx mesa-20090813/src/mesa/drivers/dri/common/vblank.c
--- mesa-20090813/src/mesa/drivers/dri/common/vblank.c.jx 2009-08-13 09:28:01.000000000 -0400
+++ mesa-20090813/src/mesa/drivers/dri/common/vblank.c 2009-09-08 14:07:51.000000000 -0400
@@ -256,7 +256,7 @@ static int do_wait( drmVBlank * vbl, GLu
if ( ret != 0 ) {
static GLboolean first_time = GL_TRUE;
- if ( first_time ) {
+ if (0) {
fprintf(stderr,
"%s: drmWaitVBlank returned %d, IRQs don't seem to be"
" working correctly.\nTry adjusting the vblank_mode"

View File

@ -0,0 +1,31 @@
From 5aaa45de4c367dd6ec5daa6f4a54504b0aff1aca Mon Sep 17 00:00:00 2001
From: Dave Airlie <airlied@linux.ie>
Date: Wed, 9 Sep 2009 15:02:16 +1000
Subject: [PATCH] r600: don't setup hardware state if TFP
if we have a BO here it means TFP and we should have set it
up already.
tested by b0le on #radeon
---
src/mesa/drivers/dri/r600/r600_texstate.c | 4 ++++
1 files changed, 4 insertions(+), 0 deletions(-)
diff --git a/src/mesa/drivers/dri/r600/r600_texstate.c b/src/mesa/drivers/dri/r600/r600_texstate.c
index fff6e74..ff4ef1e 100644
--- a/src/mesa/drivers/dri/r600/r600_texstate.c
+++ b/src/mesa/drivers/dri/r600/r600_texstate.c
@@ -608,6 +608,10 @@ static void setup_hardware_state(context_t *rmesa, struct gl_texture_object *tex
int firstlevel = t->mt ? t->mt->firstLevel : 0;
GLuint uTexelPitch, row_align;
+ if ( t->bo ) {
+ return GL_TRUE;
+ }
+
firstImage = t->base.Image[0][firstlevel];
if (!t->image_override) {
--
1.6.2.5