Re: [Mesa-dev] [PATCH 0/5] First batch of gm45 clipping/interpolation fixes

2012-07-13 Thread Olivier Galibert 
On Sat, Jun 30, 2012 at 08:50:10PM +0200, Olivier Galibert wrote:
 This is the first part of the fixes I've done to make my gm45 work
 correctly w.r.t clipping and interpolation.  There's a fair chance
 they work for everything gen 4/5, but I have no way to be sure.

So, not even one comment, nothing?

  OG.
___
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/mesa-dev

[Mesa-dev] [Bug 51972] Compilation error on x86-64 with --enable-32-bit option

2012-07-13 Thread bugzilla-daemon 
https://bugs.freedesktop.org/show_bug.cgi?id=51972

--- Comment #6 from Michel Dänzer mic...@daenzer.net 2012-07-13 09:56:23 PDT 
---
(In reply to comment #5)
 checking for XML_ParserCreate in -lexpat... no
 configure: error: Expat required for DRI.

That would be the libexpat1-dev:i386 package.

-- 
Configure bugmail: https://bugs.freedesktop.org/userprefs.cgi?tab=email
--- You are receiving this mail because: ---
You are the assignee for the bug.
___
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/mesa-dev

Re: [Mesa-dev] [PATCH 2/2] mesa/st: Generates TGSI that always recognizes INSTANCEID/VERTEXID as integers.

2012-07-13 Thread Olivier Galibert 
On Thu, Jul 12, 2012 at 08:50:13PM +0100, jfons...@vmware.com wrote:
 From: José Fonseca jfons...@vmware.com
 
 Tested by running piglit draw-instanced, and by forcing llvmpipe advertise no 
 native
 integer support, which now produces:

Looks like a very good solution to me.  Did you check
draw-non-instanced too?  51366 is a variant of the same issue.

  OG.

___
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/mesa-dev

[Mesa-dev] [Bug 47375] Blender crash on startup after upgrade to mesa 8.0.1

2012-07-13 Thread bugzilla-daemon 
https://bugs.freedesktop.org/show_bug.cgi?id=47375

--- Comment #2 from Barto mister.free...@laposte.net 2012-07-13 10:10:37 PDT 
---
same bug with a radeon 9000 card ( M9 ) :

OpenGL renderer string: Mesa DRI R200 (RV250 4C66) x86/MMX/SSE2 TCL DRI2

blender crashs with this message with mesa 8.0.4 :

blender: swrast/s_span.c:1327: _swrast_write_rgba_span: Assertion `colorType ==
0x1401 || colorType == 0x1406' failed.

the bug doesn't occur with an old mesa release ( Mesa-7.11.2 )

-- 
Configure bugmail: https://bugs.freedesktop.org/userprefs.cgi?tab=email
--- You are receiving this mail because: ---
You are the assignee for the bug.
___
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/mesa-dev

[Mesa-dev] [Bug 51366] [llvmpipe] src/gallium/auxiliary/draw/draw_llvm.c:1475:draw_llvm_generate: Assertion `0' failed.

2012-07-13 Thread bugzilla-daemon 
https://bugs.freedesktop.org/show_bug.cgi?id=51366

José Fonseca jfons...@vmware.com changed:

   What|Removed |Added

 Status|REOPENED|RESOLVED
 Resolution||FIXED

--- Comment #4 from José Fonseca jfons...@vmware.com 2012-07-13 12:02:41 PDT 
---
Should be fixed with b3ba0a7afa6311e12852fb1373452e480f89ea96 now.

-- 
Configure bugmail: https://bugs.freedesktop.org/userprefs.cgi?tab=email
--- You are receiving this mail because: ---
You are the assignee for the bug.
___
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/mesa-dev

Re: [Mesa-dev] [PATCH 2/2] mesa/st: Generates TGSI that always recognizes INSTANCEID/VERTEXID as integers.

2012-07-13 Thread Jose Fonseca 
- Original Message -
 On Thu, Jul 12, 2012 at 08:50:13PM +0100, jfons...@vmware.com wrote:
  From: José Fonseca jfons...@vmware.com
  
  Tested by running piglit draw-instanced, and by forcing llvmpipe
  advertise no native
  integer support, which now produces:
 
 Looks like a very good solution to me.  Did you check
 draw-non-instanced too?  51366 is a variant of the same issue.

I got a bogus assertion failure because TGSI_PROCESSOR_VERTEX != 
PIPE_SHADER_VERTEX, but after fixing that draw-non-instanced works fine.

I've pushed the patches now. If there are any further issues let me know.

Jose
___
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/mesa-dev

[Mesa-dev] [PATCH] configure: Check xcb version when X11 pkgconfig exists

2012-07-13 Thread Tom Stellard 
Commit 6882381a2efbdf06b7002d11468c94b9964c2bc8 added a dependency on a
newer version of xcb, but the version check wasn't added in all the
necessary places.
---
 configure.ac |1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/configure.ac b/configure.ac
index 00a1d5d..0d38db5 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1001,6 +1001,7 @@ xyesno)
 
 # find the DRI deps for libGL
 if test $x11_pkgconfig = yes; then
+PKG_CHECK_MODULES([XCB],[x11-xcb xcb-glx = 1.8.1])
 dri_modules=x11 xext xdamage xfixes x11-xcb xcb-glx
 
 # add xf86vidmode if available
-- 
1.7.7.6

___
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/mesa-dev

[Mesa-dev] [PATCH] Fix linking gallium drivers after defadf2b1

2012-07-13 Thread Jon TURNEY 
Commit defadf2b1 erroneously tries to make gallium drivers link with
libdricore as a static library, not a shared library

Also change uses of DRI_LIB_DEPS in gallium driver Makefiles to
GALLIUM_DRI_LIB_DEPS, so the libraries added are used in the linking the
gallium driver

Signed-off-by: Jon TURNEY jon.tur...@dronecode.org.uk
---
 configure.ac  |2 +-
 src/gallium/targets/dri-i915/Makefile |2 +-
 src/gallium/targets/dri-nouveau/Makefile  |2 +-
 src/gallium/targets/dri-r300/Makefile |2 +-
 src/gallium/targets/dri-r600/Makefile |2 +-
 src/gallium/targets/dri-radeonsi/Makefile |2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/configure.ac b/configure.ac
index 00a1d5d..01d9dda 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1067,7 +1067,7 @@ GALLIUM_DRI_LIB_DEPS='$(TOP)/src/mesa/libmesa.a'
 dnl ... or dricore?
 if test x$enable_dri = xyes  test x$driglx_direct = xyes ; then
 DRI_LIB_DEPS='$(TOP)/src/mesa/libdricore/libdricore$(VERSION).la'
-GALLIUM_DRI_LIB_DEPS='$(TOP)/src/mesa/libdricore/libdricore$(VERSION).a'
+GALLIUM_DRI_LIB_DEPS='$(TOP)/src/mesa/libdricore/libdricore$(VERSION).so'
 HAVE_DRICORE=yes
 fi
 AM_CONDITIONAL(HAVE_DRICORE, test x$HAVE_DRICORE = xyes)
diff --git a/src/gallium/targets/dri-i915/Makefile 
b/src/gallium/targets/dri-i915/Makefile
index 2ba3eb6..ddebff2 100644
--- a/src/gallium/targets/dri-i915/Makefile
+++ b/src/gallium/targets/dri-i915/Makefile
@@ -28,6 +28,6 @@ endif
 
 include ../Makefile.dri
 
-DRI_LIB_DEPS += -ldrm_intel
+GALLIUM_DRI_LIB_DEPS += -ldrm_intel
 
 symlinks:
diff --git a/src/gallium/targets/dri-nouveau/Makefile 
b/src/gallium/targets/dri-nouveau/Makefile
index c3c2778..25e6aea 100644
--- a/src/gallium/targets/dri-nouveau/Makefile
+++ b/src/gallium/targets/dri-nouveau/Makefile
@@ -23,6 +23,6 @@ DRIVER_DEFINES = \
 
 include ../Makefile.dri
 
-DRI_LIB_DEPS += $(shell $(PKG_CONFIG) libdrm_nouveau --libs)
+GALLIUM_DRI_LIB_DEPS += $(shell $(PKG_CONFIG) libdrm_nouveau --libs)
 
 symlinks:
diff --git a/src/gallium/targets/dri-r300/Makefile 
b/src/gallium/targets/dri-r300/Makefile
index 6a8bf66..256aa23 100644
--- a/src/gallium/targets/dri-r300/Makefile
+++ b/src/gallium/targets/dri-r300/Makefile
@@ -21,6 +21,6 @@ DRIVER_DEFINES = \
 
 include ../Makefile.dri
 
-DRI_LIB_DEPS += -ldrm_radeon
+GALLIUM_DRI_LIB_DEPS += -ldrm_radeon
 
 symlinks:
diff --git a/src/gallium/targets/dri-r600/Makefile 
b/src/gallium/targets/dri-r600/Makefile
index 9cc9cb9..7402750 100644
--- a/src/gallium/targets/dri-r600/Makefile
+++ b/src/gallium/targets/dri-r600/Makefile
@@ -21,6 +21,6 @@ DRIVER_DEFINES = \
 
 include ../Makefile.dri
 
-DRI_LIB_DEPS += -ldrm_radeon
+GALLIUM_DRI_LIB_DEPS += -ldrm_radeon
 
 symlinks:
diff --git a/src/gallium/targets/dri-radeonsi/Makefile 
b/src/gallium/targets/dri-radeonsi/Makefile
index f76d71b..b45f243 100644
--- a/src/gallium/targets/dri-radeonsi/Makefile
+++ b/src/gallium/targets/dri-radeonsi/Makefile
@@ -21,6 +21,6 @@ DRIVER_DEFINES = \
 
 include ../Makefile.dri
 
-DRI_LIB_DEPS += -ldrm_radeon
+GALLIUM_DRI_LIB_DEPS += -ldrm_radeon
 
 symlinks:
-- 
1.7.9

___
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/mesa-dev

[Mesa-dev] [Bug 51960] [bisected] Mesa master fails to build

2012-07-13 Thread bugzilla-daemon 
https://bugs.freedesktop.org/show_bug.cgi?id=51960

Kristian Høgsberg k...@bitplanet.net changed:

   What|Removed |Added

 Status|NEW |RESOLVED
 Resolution||INVALID

--- Comment #1 from Kristian Høgsberg k...@bitplanet.net 2012-07-13 15:15:02 
PDT ---
Looks like you just have an invalid .o file in your repo.  Try make clean and
make again.

-- 
Configure bugmail: https://bugs.freedesktop.org/userprefs.cgi?tab=email
--- You are receiving this mail because: ---
You are the assignee for the bug.
___
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/mesa-dev

[Mesa-dev] [Bug 51997] make distclean producing errors

2012-07-13 Thread bugzilla-daemon 
https://bugs.freedesktop.org/show_bug.cgi?id=51997

--- Comment #1 from Kristian Høgsberg k...@bitplanet.net 2012-07-13 15:24:45 
PDT ---
Should be fixed in 426a23af147720ae3b89995ffee792a29e8ae2db.

-- 
Configure bugmail: https://bugs.freedesktop.org/userprefs.cgi?tab=email
--- You are receiving this mail because: ---
You are the assignee for the bug.
___
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/mesa-dev

[Mesa-dev] [Bug 51997] make distclean producing errors

2012-07-13 Thread bugzilla-daemon 
https://bugs.freedesktop.org/show_bug.cgi?id=51997

Brian Paterni bpate...@gmail.com changed:

   What|Removed |Added

 Status|NEW |RESOLVED
 Resolution||FIXED

--- Comment #2 from Brian Paterni bpate...@gmail.com 2012-07-13 15:34:13 PDT 
---
No longer seeing it here.

Thanks Kristian :)

-- 
Configure bugmail: https://bugs.freedesktop.org/userprefs.cgi?tab=email
--- You are receiving this mail because: ---
You are the assignee for the bug.
___
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/mesa-dev

[Mesa-dev] [Bug 52059] New: __indirect_glReadPixels USE_XCB path buffer overflow

2012-07-13 Thread bugzilla-daemon 
https://bugs.freedesktop.org/show_bug.cgi?id=52059

 Bug #: 52059
   Summary: __indirect_glReadPixels USE_XCB path buffer overflow
Classification: Unclassified
   Product: Mesa
   Version: 8.0
  Platform: Other
OS/Version: All
Status: NEW
  Severity: normal
  Priority: medium
 Component: GLX
AssignedTo: mesa-dev@lists.freedesktop.org
ReportedBy: jcris...@debian.org


Hi,

it seems the USE_XCB path in indirect glReadPixels doesn't take the state set
e.g. with glPixelStorei( GL_PACK_ALIGNMENT, 1 ) into account.  The non-xcb path
uses __glEmptyImage which does use these values, the xcb path does a plain
memcpy which may overwrite the caller's buffer.

-- 
Configure bugmail: https://bugs.freedesktop.org/userprefs.cgi?tab=email
--- You are receiving this mail because: ---
You are the assignee for the bug.
___
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/mesa-dev

[Mesa-dev] [PATCH] Fix linking gallium drivers and with dricore after defadf2b1 (v2)

2012-07-13 Thread Jon TURNEY 
Commit defadf2b1 erroneously tries to make gallium drivers link with
libdricore as a static library, not a shared library

Also, change uses of DRI_LIB_DEPS in gallium driver Makefiles to
GALLIUM_DRI_LIB_DEPS, so the libraries added are used in the linking the
gallium driver

Also, fix the path to the libdricore symlink, it's made in LIB_DIR, not
in the libdricore directory

Also repair quoting of dricore settings of *LIB_DEPS variables so VERSION
is interpolated in configure but $(TOP) and $(LIB_DIR) are interpolated
later (where they are known, but VERSION isn't)

Signed-off-by: Jon TURNEY jon.tur...@dronecode.org.uk
---
 configure.ac  |4 ++--
 src/gallium/targets/dri-i915/Makefile |2 +-
 src/gallium/targets/dri-nouveau/Makefile  |2 +-
 src/gallium/targets/dri-r300/Makefile |2 +-
 src/gallium/targets/dri-r600/Makefile |2 +-
 src/gallium/targets/dri-radeonsi/Makefile |2 +-
 6 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/configure.ac b/configure.ac
index 00a1d5d..8ddb7b7 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1066,8 +1066,8 @@ GALLIUM_DRI_LIB_DEPS='$(TOP)/src/mesa/libmesa.a'
 
 dnl ... or dricore?
 if test x$enable_dri = xyes  test x$driglx_direct = xyes ; then
-DRI_LIB_DEPS='$(TOP)/src/mesa/libdricore/libdricore$(VERSION).la'
-GALLIUM_DRI_LIB_DEPS='$(TOP)/src/mesa/libdricore/libdricore$(VERSION).a'
+DRI_LIB_DEPS=\$(TOP)/src/mesa/libdricore/libdricore${VERSION}.la
+GALLIUM_DRI_LIB_DEPS=\$(TOP)/\$(LIB_DIR)/libdricore${VERSION}.so
 HAVE_DRICORE=yes
 fi
 AM_CONDITIONAL(HAVE_DRICORE, test x$HAVE_DRICORE = xyes)
diff --git a/src/gallium/targets/dri-i915/Makefile 
b/src/gallium/targets/dri-i915/Makefile
index 2ba3eb6..ddebff2 100644
--- a/src/gallium/targets/dri-i915/Makefile
+++ b/src/gallium/targets/dri-i915/Makefile
@@ -28,6 +28,6 @@ endif
 
 include ../Makefile.dri
 
-DRI_LIB_DEPS += -ldrm_intel
+GALLIUM_DRI_LIB_DEPS += -ldrm_intel
 
 symlinks:
diff --git a/src/gallium/targets/dri-nouveau/Makefile 
b/src/gallium/targets/dri-nouveau/Makefile
index c3c2778..25e6aea 100644
--- a/src/gallium/targets/dri-nouveau/Makefile
+++ b/src/gallium/targets/dri-nouveau/Makefile
@@ -23,6 +23,6 @@ DRIVER_DEFINES = \
 
 include ../Makefile.dri
 
-DRI_LIB_DEPS += $(shell $(PKG_CONFIG) libdrm_nouveau --libs)
+GALLIUM_DRI_LIB_DEPS += $(shell $(PKG_CONFIG) libdrm_nouveau --libs)
 
 symlinks:
diff --git a/src/gallium/targets/dri-r300/Makefile 
b/src/gallium/targets/dri-r300/Makefile
index 6a8bf66..256aa23 100644
--- a/src/gallium/targets/dri-r300/Makefile
+++ b/src/gallium/targets/dri-r300/Makefile
@@ -21,6 +21,6 @@ DRIVER_DEFINES = \
 
 include ../Makefile.dri
 
-DRI_LIB_DEPS += -ldrm_radeon
+GALLIUM_DRI_LIB_DEPS += -ldrm_radeon
 
 symlinks:
diff --git a/src/gallium/targets/dri-r600/Makefile 
b/src/gallium/targets/dri-r600/Makefile
index 9cc9cb9..7402750 100644
--- a/src/gallium/targets/dri-r600/Makefile
+++ b/src/gallium/targets/dri-r600/Makefile
@@ -21,6 +21,6 @@ DRIVER_DEFINES = \
 
 include ../Makefile.dri
 
-DRI_LIB_DEPS += -ldrm_radeon
+GALLIUM_DRI_LIB_DEPS += -ldrm_radeon
 
 symlinks:
diff --git a/src/gallium/targets/dri-radeonsi/Makefile 
b/src/gallium/targets/dri-radeonsi/Makefile
index f76d71b..b45f243 100644
--- a/src/gallium/targets/dri-radeonsi/Makefile
+++ b/src/gallium/targets/dri-radeonsi/Makefile
@@ -21,6 +21,6 @@ DRIVER_DEFINES = \
 
 include ../Makefile.dri
 
-DRI_LIB_DEPS += -ldrm_radeon
+GALLIUM_DRI_LIB_DEPS += -ldrm_radeon
 
 symlinks:
-- 
1.7.9

___
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/mesa-dev

Re: [Mesa-dev] [PATCH] Fix linking gallium drivers and with dricore after defadf2b1 (v2)

2012-07-13 Thread Tom Stellard 
On Fri, Jul 13, 2012 at 05:05:05PM +0100, Jon TURNEY wrote:
 Commit defadf2b1 erroneously tries to make gallium drivers link with
 libdricore as a static library, not a shared library
 
 Also, change uses of DRI_LIB_DEPS in gallium driver Makefiles to
 GALLIUM_DRI_LIB_DEPS, so the libraries added are used in the linking the
 gallium driver
 
 Also, fix the path to the libdricore symlink, it's made in LIB_DIR, not
 in the libdricore directory
 
 Also repair quoting of dricore settings of *LIB_DEPS variables so VERSION
 is interpolated in configure but $(TOP) and $(LIB_DIR) are interpolated
 later (where they are known, but VERSION isn't)


Just tested and this fixes the build, please commit ASAP.

 Signed-off-by: Jon TURNEY jon.tur...@dronecode.org.uk

  Signed-off-by: Tom Stellard thomas.stell...@amd.com 

 ---
  configure.ac  |4 ++--
  src/gallium/targets/dri-i915/Makefile |2 +-
  src/gallium/targets/dri-nouveau/Makefile  |2 +-
  src/gallium/targets/dri-r300/Makefile |2 +-
  src/gallium/targets/dri-r600/Makefile |2 +-
  src/gallium/targets/dri-radeonsi/Makefile |2 +-
  6 files changed, 7 insertions(+), 7 deletions(-)
 
 diff --git a/configure.ac b/configure.ac
 index 00a1d5d..8ddb7b7 100644
 --- a/configure.ac
 +++ b/configure.ac
 @@ -1066,8 +1066,8 @@ GALLIUM_DRI_LIB_DEPS='$(TOP)/src/mesa/libmesa.a'
  
  dnl ... or dricore?
  if test x$enable_dri = xyes  test x$driglx_direct = xyes ; then
 -DRI_LIB_DEPS='$(TOP)/src/mesa/libdricore/libdricore$(VERSION).la'
 -GALLIUM_DRI_LIB_DEPS='$(TOP)/src/mesa/libdricore/libdricore$(VERSION).a'
 +DRI_LIB_DEPS=\$(TOP)/src/mesa/libdricore/libdricore${VERSION}.la
 +GALLIUM_DRI_LIB_DEPS=\$(TOP)/\$(LIB_DIR)/libdricore${VERSION}.so
  HAVE_DRICORE=yes
  fi
  AM_CONDITIONAL(HAVE_DRICORE, test x$HAVE_DRICORE = xyes)
 diff --git a/src/gallium/targets/dri-i915/Makefile 
 b/src/gallium/targets/dri-i915/Makefile
 index 2ba3eb6..ddebff2 100644
 --- a/src/gallium/targets/dri-i915/Makefile
 +++ b/src/gallium/targets/dri-i915/Makefile
 @@ -28,6 +28,6 @@ endif
  
  include ../Makefile.dri
  
 -DRI_LIB_DEPS += -ldrm_intel
 +GALLIUM_DRI_LIB_DEPS += -ldrm_intel
  
  symlinks:
 diff --git a/src/gallium/targets/dri-nouveau/Makefile 
 b/src/gallium/targets/dri-nouveau/Makefile
 index c3c2778..25e6aea 100644
 --- a/src/gallium/targets/dri-nouveau/Makefile
 +++ b/src/gallium/targets/dri-nouveau/Makefile
 @@ -23,6 +23,6 @@ DRIVER_DEFINES = \
  
  include ../Makefile.dri
  
 -DRI_LIB_DEPS += $(shell $(PKG_CONFIG) libdrm_nouveau --libs)
 +GALLIUM_DRI_LIB_DEPS += $(shell $(PKG_CONFIG) libdrm_nouveau --libs)
  
  symlinks:
 diff --git a/src/gallium/targets/dri-r300/Makefile 
 b/src/gallium/targets/dri-r300/Makefile
 index 6a8bf66..256aa23 100644
 --- a/src/gallium/targets/dri-r300/Makefile
 +++ b/src/gallium/targets/dri-r300/Makefile
 @@ -21,6 +21,6 @@ DRIVER_DEFINES = \
  
  include ../Makefile.dri
  
 -DRI_LIB_DEPS += -ldrm_radeon
 +GALLIUM_DRI_LIB_DEPS += -ldrm_radeon
  
  symlinks:
 diff --git a/src/gallium/targets/dri-r600/Makefile 
 b/src/gallium/targets/dri-r600/Makefile
 index 9cc9cb9..7402750 100644
 --- a/src/gallium/targets/dri-r600/Makefile
 +++ b/src/gallium/targets/dri-r600/Makefile
 @@ -21,6 +21,6 @@ DRIVER_DEFINES = \
  
  include ../Makefile.dri
  
 -DRI_LIB_DEPS += -ldrm_radeon
 +GALLIUM_DRI_LIB_DEPS += -ldrm_radeon
  
  symlinks:
 diff --git a/src/gallium/targets/dri-radeonsi/Makefile 
 b/src/gallium/targets/dri-radeonsi/Makefile
 index f76d71b..b45f243 100644
 --- a/src/gallium/targets/dri-radeonsi/Makefile
 +++ b/src/gallium/targets/dri-radeonsi/Makefile
 @@ -21,6 +21,6 @@ DRIVER_DEFINES = \
  
  include ../Makefile.dri
  
 -DRI_LIB_DEPS += -ldrm_radeon
 +GALLIUM_DRI_LIB_DEPS += -ldrm_radeon
  
  symlinks:
 -- 
 1.7.9
 
 ___
 mesa-dev mailing list
 mesa-dev@lists.freedesktop.org
 http://lists.freedesktop.org/mailman/listinfo/mesa-dev
 

___
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/mesa-dev

[Mesa-dev] [Bug 52059] __indirect_glReadPixels USE_XCB path buffer overflow

2012-07-13 Thread bugzilla-daemon 
https://bugs.freedesktop.org/show_bug.cgi?id=52059

--- Comment #1 from Julien Cristau jcris...@debian.org 2012-07-13 16:23:32 
PDT ---
as a PoC, the patch below seems to fix the crashes and valgrind complaints I'd
been seeing.  A real fix would involve glX_proto_send.py.

diff --git a/src/glx/indirect.c b/src/glx/indirect.c
index a6b0c0d..ea0ccf2 100644
--- a/src/glx/indirect.c
+++ b/src/glx/indirect.c
@@ -3756,9 +3756,7 @@ __indirect_glReadPixels(GLint x, GLint y, GLsizei width,
GLsizei height,
   state-storePack.
   swapEndian, 0),
   NULL);
-(void) memcpy(pixels, xcb_glx_read_pixels_data(reply),
-  xcb_glx_read_pixels_data_length(reply) *
-  sizeof(GLvoid));
+__glEmptyImage(gc, 3, width, height, 1, format, type,
xcb_glx_read_pixels_data(reply), pixels);
 free(reply);
 #else
 GLubyte const *pc =

-- 
Configure bugmail: https://bugs.freedesktop.org/userprefs.cgi?tab=email
--- You are receiving this mail because: ---
You are the assignee for the bug.
___
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/mesa-dev

Re: [Mesa-dev] [PATCH] softpipe: Take all lods into account when texture sampling.

2012-07-13 Thread Olivier Galibert 
On Wed, Jun 20, 2012 at 08:33:38AM -0600, Brian Paul wrote:
 Yeah, I think it's pretty clear that we need to support per-pixel LOD 
 selection.  For softpipe, Olivier's big patch looks good.

... and then nothing happened.  Ping?  The only code remark was a
whitespace issue on one line :-)


 For 
 llvmpipe it's important to maintain performance for the common case 
 where we compute LOD per quad but we'll also need new paths for 
 per-pixel LOD.  Hopefully, the two paths can share some code.

I've been thinking, it looks reasonable to statically check whether
the lod/grad/bias is shared at the glsl level.  Then we could have
separate opcodes for the texturing variants for when we're sure things
are shared and when we aren't.  And pay the cost only when it is
needed.  Would that sound reasonable?

  OG.

___
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/mesa-dev

Re: [Mesa-dev] [PATCH] radeon/llvm: fix CR/LF

2012-07-13 Thread Tom Stellard 
Push, thanks.

Sorry it took so long.

-Tom

On Tue, Jun 19, 2012 at 07:50:22PM +0200, Andreas Boll wrote:
 ---
  src/gallium/drivers/radeon/AMDILSIDevice.h |2 +-
  1 files changed, 1 insertions(+), 1 deletions(-)
 
 diff --git a/src/gallium/drivers/radeon/AMDILSIDevice.h 
 b/src/gallium/drivers/radeon/AMDILSIDevice.h
 index b272af7..bc7d4b8 100644
 --- a/src/gallium/drivers/radeon/AMDILSIDevice.h
 +++ b/src/gallium/drivers/radeon/AMDILSIDevice.h
 @@ -12,7 +12,7 @@
  
 //===-===//
  // This file will define the interface that each generation needs to
  // implement in order to correctly answer queries on the capabilities of the
 -// specific hardware.
 +// specific hardware.
  
 //===-===//
  #ifndef _AMDILSIDEVICE_H_
  #define _AMDILSIDEVICE_H_
 -- 
 1.7.1
 
 ___
 mesa-dev mailing list
 mesa-dev@lists.freedesktop.org
 http://lists.freedesktop.org/mailman/listinfo/mesa-dev
 

___
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/mesa-dev

Re: [Mesa-dev] [PATCH] Fix linking gallium drivers and with dricore after defadf2b1 (v2)

2012-07-13 Thread Kristian Høgsberg 
On Fri, Jul 13, 2012 at 12:18 PM, Tom Stellard thomas.stell...@amd.com wrote:
 On Fri, Jul 13, 2012 at 05:05:05PM +0100, Jon TURNEY wrote:
 Commit defadf2b1 erroneously tries to make gallium drivers link with
 libdricore as a static library, not a shared library

 Also, change uses of DRI_LIB_DEPS in gallium driver Makefiles to
 GALLIUM_DRI_LIB_DEPS, so the libraries added are used in the linking the
 gallium driver

 Also, fix the path to the libdricore symlink, it's made in LIB_DIR, not
 in the libdricore directory

 Also repair quoting of dricore settings of *LIB_DEPS variables so VERSION
 is interpolated in configure but $(TOP) and $(LIB_DIR) are interpolated
 later (where they are known, but VERSION isn't)


 Just tested and this fixes the build, please commit ASAP.

 Signed-off-by: Jon TURNEY jon.tur...@dronecode.org.uk

   Signed-off-by: Tom Stellard thomas.stell...@amd.com

Me too, that is, please commit and

Tested-by: Kristian Høgsberg k...@bitplanet.net

 ---
  configure.ac  |4 ++--
  src/gallium/targets/dri-i915/Makefile |2 +-
  src/gallium/targets/dri-nouveau/Makefile  |2 +-
  src/gallium/targets/dri-r300/Makefile |2 +-
  src/gallium/targets/dri-r600/Makefile |2 +-
  src/gallium/targets/dri-radeonsi/Makefile |2 +-
  6 files changed, 7 insertions(+), 7 deletions(-)

 diff --git a/configure.ac b/configure.ac
 index 00a1d5d..8ddb7b7 100644
 --- a/configure.ac
 +++ b/configure.ac
 @@ -1066,8 +1066,8 @@ GALLIUM_DRI_LIB_DEPS='$(TOP)/src/mesa/libmesa.a'

  dnl ... or dricore?
  if test x$enable_dri = xyes  test x$driglx_direct = xyes ; then
 -DRI_LIB_DEPS='$(TOP)/src/mesa/libdricore/libdricore$(VERSION).la'
 -GALLIUM_DRI_LIB_DEPS='$(TOP)/src/mesa/libdricore/libdricore$(VERSION).a'
 +DRI_LIB_DEPS=\$(TOP)/src/mesa/libdricore/libdricore${VERSION}.la
 +GALLIUM_DRI_LIB_DEPS=\$(TOP)/\$(LIB_DIR)/libdricore${VERSION}.so
  HAVE_DRICORE=yes
  fi
  AM_CONDITIONAL(HAVE_DRICORE, test x$HAVE_DRICORE = xyes)
 diff --git a/src/gallium/targets/dri-i915/Makefile 
 b/src/gallium/targets/dri-i915/Makefile
 index 2ba3eb6..ddebff2 100644
 --- a/src/gallium/targets/dri-i915/Makefile
 +++ b/src/gallium/targets/dri-i915/Makefile
 @@ -28,6 +28,6 @@ endif

  include ../Makefile.dri

 -DRI_LIB_DEPS += -ldrm_intel
 +GALLIUM_DRI_LIB_DEPS += -ldrm_intel

  symlinks:
 diff --git a/src/gallium/targets/dri-nouveau/Makefile 
 b/src/gallium/targets/dri-nouveau/Makefile
 index c3c2778..25e6aea 100644
 --- a/src/gallium/targets/dri-nouveau/Makefile
 +++ b/src/gallium/targets/dri-nouveau/Makefile
 @@ -23,6 +23,6 @@ DRIVER_DEFINES = \

  include ../Makefile.dri

 -DRI_LIB_DEPS += $(shell $(PKG_CONFIG) libdrm_nouveau --libs)
 +GALLIUM_DRI_LIB_DEPS += $(shell $(PKG_CONFIG) libdrm_nouveau --libs)

  symlinks:
 diff --git a/src/gallium/targets/dri-r300/Makefile 
 b/src/gallium/targets/dri-r300/Makefile
 index 6a8bf66..256aa23 100644
 --- a/src/gallium/targets/dri-r300/Makefile
 +++ b/src/gallium/targets/dri-r300/Makefile
 @@ -21,6 +21,6 @@ DRIVER_DEFINES = \

  include ../Makefile.dri

 -DRI_LIB_DEPS += -ldrm_radeon
 +GALLIUM_DRI_LIB_DEPS += -ldrm_radeon

  symlinks:
 diff --git a/src/gallium/targets/dri-r600/Makefile 
 b/src/gallium/targets/dri-r600/Makefile
 index 9cc9cb9..7402750 100644
 --- a/src/gallium/targets/dri-r600/Makefile
 +++ b/src/gallium/targets/dri-r600/Makefile
 @@ -21,6 +21,6 @@ DRIVER_DEFINES = \

  include ../Makefile.dri

 -DRI_LIB_DEPS += -ldrm_radeon
 +GALLIUM_DRI_LIB_DEPS += -ldrm_radeon

  symlinks:
 diff --git a/src/gallium/targets/dri-radeonsi/Makefile 
 b/src/gallium/targets/dri-radeonsi/Makefile
 index f76d71b..b45f243 100644
 --- a/src/gallium/targets/dri-radeonsi/Makefile
 +++ b/src/gallium/targets/dri-radeonsi/Makefile
 @@ -21,6 +21,6 @@ DRIVER_DEFINES = \

  include ../Makefile.dri

 -DRI_LIB_DEPS += -ldrm_radeon
 +GALLIUM_DRI_LIB_DEPS += -ldrm_radeon

  symlinks:
 --
 1.7.9

 ___
 mesa-dev mailing list
 mesa-dev@lists.freedesktop.org
 http://lists.freedesktop.org/mailman/listinfo/mesa-dev


 ___
 mesa-dev mailing list
 mesa-dev@lists.freedesktop.org
 http://lists.freedesktop.org/mailman/listinfo/mesa-dev
___
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/mesa-dev

[Mesa-dev] Convert a few gallium libs automake

2012-07-13 Thread Tom Stellard 
Hi,

Here are some patches that convert a few more gallium libs to automake.

These can also be found in the gallium-automake branch here:
cgit.freedesktop.org/~tstellar/mesa/

-Tom

___
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/mesa-dev

[Mesa-dev] [PATCH 1/6] gallium: Add common automake include file

2012-07-13 Thread Tom Stellard 
---
 src/gallium/Automake.inc |7 +++
 1 files changed, 7 insertions(+), 0 deletions(-)
 create mode 100644 src/gallium/Automake.inc

diff --git a/src/gallium/Automake.inc b/src/gallium/Automake.inc
new file mode 100644
index 000..ded579f
--- /dev/null
+++ b/src/gallium/Automake.inc
@@ -0,0 +1,7 @@
+GALLIUM_CFLAGS = \
+   -I$(top_srcdir)/src/gallium/include \
+   -I$(top_srcdir)/src/gallium/auxiliary \
+   $(DEFINES) \
+   $(ARCH_FLAGS) \
+   $(OPT_FLAGS) \
+   $(PIC_FLAGS)
-- 
1.7.6.5

___
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/mesa-dev

[Mesa-dev] [PATCH 2/6] r300g: Use gallium automake include file

2012-07-13 Thread Tom Stellard 
---
 src/gallium/drivers/r300/Makefile.am |   10 +++---
 1 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/src/gallium/drivers/r300/Makefile.am 
b/src/gallium/drivers/r300/Makefile.am
index 3d08611..6c4bba7 100644
--- a/src/gallium/drivers/r300/Makefile.am
+++ b/src/gallium/drivers/r300/Makefile.am
@@ -1,4 +1,5 @@
 include Makefile.sources
+include $(top_srcdir)/src/gallium/Automake.inc
 
 noinst_LIBRARIES = libr300.a
 check_PROGRAMS = r300_compiler_tests
@@ -6,19 +7,14 @@ testdir = compiler/tests
 TESTS = r300_compiler_tests
 
 AM_CFLAGS = \
-   -I$(top_srcdir)/src/gallium/include \
-   -I$(top_srcdir)/src/gallium/auxiliary \
-I$(top_srcdir)/src/gallium/drivers \
-I$(top_srcdir)/include \
-I$(top_srcdir)/src/mesa \
-I$(top_srcdir)/src/glsl \
-I$(top_srcdir)/src/mapi \
+   $(GALLIUM_CFLAGS) \
$(LLVM_CFLAGS) \
-   $(RADEON_CFLAGS) \
-   $(DEFINES) \
-   $(ARCH_FLAGS) \
-   $(OPT_FLAGS) \
-   $(PIC_FLAGS)
+   $(RADEON_CFLAGS)
 
 libr300_a_SOURCES = \
$(C_SOURCES) \
-- 
1.7.6.5

___
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/mesa-dev

[Mesa-dev] [PATCH 4/6] radeon/winsys: Convert to automake

2012-07-13 Thread Tom Stellard 
---
 configure.ac  |1 +
 src/gallium/winsys/radeon/drm/.gitignore  |1 +
 src/gallium/winsys/radeon/drm/Makefile|   15 ---
 src/gallium/winsys/radeon/drm/Makefile.am |   18 ++
 4 files changed, 20 insertions(+), 15 deletions(-)
 create mode 100644 src/gallium/winsys/radeon/drm/.gitignore
 delete mode 100644 src/gallium/winsys/radeon/drm/Makefile
 create mode 100644 src/gallium/winsys/radeon/drm/Makefile.am

diff --git a/configure.ac b/configure.ac
index 9227474..3129001 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2137,6 +2137,7 @@ AC_CONFIG_FILES([configs/current
src/gallium/drivers/r300/Makefile
src/gallium/drivers/r600/Makefile
src/gallium/targets/opencl/Makefile
+   src/gallium/winsys/radeon/drm/Makefile
src/gbm/Makefile
src/gbm/main/gbm.pc
src/egl/drivers/Makefile
diff --git a/src/gallium/winsys/radeon/drm/.gitignore 
b/src/gallium/winsys/radeon/drm/.gitignore
new file mode 100644
index 000..f3c7a7c
--- /dev/null
+++ b/src/gallium/winsys/radeon/drm/.gitignore
@@ -0,0 +1 @@
+Makefile
diff --git a/src/gallium/winsys/radeon/drm/Makefile 
b/src/gallium/winsys/radeon/drm/Makefile
deleted file mode 100644
index 517360e..000
--- a/src/gallium/winsys/radeon/drm/Makefile
+++ /dev/null
@@ -1,15 +0,0 @@
-
-TOP = ../../../../..
-include $(TOP)/configs/current
-
-LIBNAME = radeonwinsys
-
-# get C_SOURCES
-include Makefile.sources
-
-LIBRARY_INCLUDES = -I$(TOP)/include \
-  $(shell $(PKG_CONFIG) libdrm --cflags-only-I)
-
-include ../../../Makefile.template
-
-symlinks:
diff --git a/src/gallium/winsys/radeon/drm/Makefile.am 
b/src/gallium/winsys/radeon/drm/Makefile.am
new file mode 100644
index 000..eee0bf4
--- /dev/null
+++ b/src/gallium/winsys/radeon/drm/Makefile.am
@@ -0,0 +1,18 @@
+include Makefile.sources
+include $(top_srcdir)/src/gallium/Automake.inc
+
+noinst_LTLIBRARIES = libradeonwinsys.la
+
+libradeonwinsys_la_CFLAGS = \
+   -I$(top_srcdir)/include \
+   $(GALLIUM_CFLAGS) \
+   $(shell $(PKG_CONFIG) libdrm --cflags-only-I)
+
+libradeonwinsys_la_SOURCES = $(C_SOURCES)
+
+#XXX: Delete this when all targets using the radeon winsys are converted to 
automake.
+all-local: libradeonwinsys.la
+   ln -f $(builddir)/.libs/libradeonwinsys.a $(builddir)/libradeonwinsys.a
+
+#XXX: Delete this when the winsys makefile is converted to automake. 
+default: all
-- 
1.7.6.5

___
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/mesa-dev

[Mesa-dev] [PATCH 5/6] trace: Convert to automake

2012-07-13 Thread Tom Stellard 
---
 configure.ac  |1 +
 src/gallium/drivers/trace/.gitignore  |2 ++
 src/gallium/drivers/trace/Makefile|   13 -
 src/gallium/drivers/trace/Makefile.am |   17 +
 4 files changed, 20 insertions(+), 13 deletions(-)
 create mode 100644 src/gallium/drivers/trace/.gitignore
 delete mode 100644 src/gallium/drivers/trace/Makefile
 create mode 100644 src/gallium/drivers/trace/Makefile.am

diff --git a/configure.ac b/configure.ac
index 3129001..43cf072 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2136,6 +2136,7 @@ AC_CONFIG_FILES([configs/current
src/gallium/drivers/Makefile
src/gallium/drivers/r300/Makefile
src/gallium/drivers/r600/Makefile
+   src/gallium/drivers/trace/Makefile
src/gallium/targets/opencl/Makefile
src/gallium/winsys/radeon/drm/Makefile
src/gbm/Makefile
diff --git a/src/gallium/drivers/trace/.gitignore 
b/src/gallium/drivers/trace/.gitignore
new file mode 100644
index 000..282522d
--- /dev/null
+++ b/src/gallium/drivers/trace/.gitignore
@@ -0,0 +1,2 @@
+Makefile
+Makefile.in
diff --git a/src/gallium/drivers/trace/Makefile 
b/src/gallium/drivers/trace/Makefile
deleted file mode 100644
index 99e5fb8..000
--- a/src/gallium/drivers/trace/Makefile
+++ /dev/null
@@ -1,13 +0,0 @@
-TOP = ../../../..
-include $(TOP)/configs/current
-
-LIBNAME = trace
-
-C_SOURCES = \
-   tr_context.c \
-   tr_dump.c \
-   tr_dump_state.c \
-   tr_screen.c \
-   tr_texture.c
-
-include ../../Makefile.template
diff --git a/src/gallium/drivers/trace/Makefile.am 
b/src/gallium/drivers/trace/Makefile.am
new file mode 100644
index 000..1cc7a48
--- /dev/null
+++ b/src/gallium/drivers/trace/Makefile.am
@@ -0,0 +1,17 @@
+include $(top_srcdir)/src/gallium/Automake.inc
+
+noinst_LTLIBRARIES = libtrace.la
+
+libtrace_la_CFLAGS = \
+   $(GALLIUM_CFLAGS)
+
+libtrace_la_SOURCES = \
+   tr_context.c \
+   tr_dump.c \
+   tr_dump_state.c \
+   tr_screen.c \
+   tr_texture.c
+
+#XXX: Delete this when all targets using libtrace are converted to automake
+all-local: libtrace.la
+   ln -f $(builddir)/.libs/libtrace.a $(builddir)/libtrace.a
-- 
1.7.6.5

___
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/mesa-dev

[Mesa-dev] [PATCH 6/6] libgallium: Convert to automake

2012-07-13 Thread Tom Stellard 
---
 configure.ac  |2 +
 src/gallium/auxiliary/.gitignore  |1 +
 src/gallium/auxiliary/Makefile|   42 -
 src/gallium/auxiliary/Makefile.am |   47 +
 4 files changed, 50 insertions(+), 42 deletions(-)
 create mode 100644 src/gallium/auxiliary/.gitignore
 delete mode 100644 src/gallium/auxiliary/Makefile
 create mode 100644 src/gallium/auxiliary/Makefile.am

diff --git a/configure.ac b/configure.ac
index 43cf072..4d9b9ef 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2105,6 +2105,7 @@ AM_CONDITIONAL(USE_R600_LLVM_COMPILER, test 
x$USE_R600_LLVM_COMPILER = xyes)
 AM_CONDITIONAL(HAVE_LOADER_GALLIUM, test x$enable_gallium_loader = xyes)
 AM_CONDITIONAL(HAVE_DRM_LOADER_GALLIUM, test x$enable_gallium_drm_loader = 
xyes)
 AM_CONDITIONAL(HAVE_GALLIUM_COMPUTE, test x$enable_opencl = xyes)
+AM_CONDITIONAL(HAVE_MESA_LLVM, test x$MESA_LLVM = x1)
 AC_SUBST([GALLIUM_MAKE_DIRS])
 
 AM_CONDITIONAL(HAVE_X11_DRIVER, echo $DRIVER_DIRS | grep 'x11' /dev/null 
21)
@@ -2132,6 +2133,7 @@ AC_CONFIG_FILES([configs/current
src/Makefile
src/gallium/Makefile
src/gallium/auxiliary/pipe-loader/Makefile
+   src/gallium/auxiliary/Makefile
src/gallium/state_trackers/clover/Makefile
src/gallium/drivers/Makefile
src/gallium/drivers/r300/Makefile
diff --git a/src/gallium/auxiliary/.gitignore b/src/gallium/auxiliary/.gitignore
new file mode 100644
index 000..f3c7a7c
--- /dev/null
+++ b/src/gallium/auxiliary/.gitignore
@@ -0,0 +1 @@
+Makefile
diff --git a/src/gallium/auxiliary/Makefile b/src/gallium/auxiliary/Makefile
deleted file mode 100644
index 3ba3f9c..000
--- a/src/gallium/auxiliary/Makefile
+++ /dev/null
@@ -1,42 +0,0 @@
-TOP = ../../..
-include $(TOP)/configs/current
-
-LIBNAME = gallium
-
-# get source lists
-include Makefile.sources
-
-C_SOURCES += $(GENERATED_SOURCES)
-
-ifeq ($(MESA_LLVM),1)
-C_SOURCES += \
-   $(GALLIVM_SOURCES)
-CPP_SOURCES += \
-   $(GALLIVM_CPP_SOURCES)
-endif
-
-
-include ../Makefile.template
-
-default install clean: %: subdirs-%
-
-subdirs-%:
-   @for dir in $(SUBDIRS) ; do \
-   if [ -d $$dir ] ; then \
-   (cd $$dir  $(MAKE) $*) || exit 1; \
-   fi \
-   done
-
-indices/u_indices_gen.c: indices/u_indices_gen.py
-   $(PYTHON2) $  $@
-
-indices/u_unfilled_gen.c: indices/u_unfilled_gen.py
-   $(PYTHON2) $  $@
-
-util/u_format_srgb.c: util/u_format_srgb.py
-   $(PYTHON2) $  $@
-
-util/u_format_table.c: util/u_format_table.py util/u_format_pack.py 
util/u_format_parse.py util/u_format.csv
-   $(PYTHON2) util/u_format_table.py util/u_format.csv  $@
-
-# DO NOT DELETE
diff --git a/src/gallium/auxiliary/Makefile.am 
b/src/gallium/auxiliary/Makefile.am
new file mode 100644
index 000..e4ce16a
--- /dev/null
+++ b/src/gallium/auxiliary/Makefile.am
@@ -0,0 +1,47 @@
+AUTOMAKE_OPTIONS = subdir-objects
+# get source lists
+include Makefile.sources
+include $(top_srcdir)/src/gallium/Automake.inc
+
+SUBDIRS += pipebuffer
+noinst_LTLIBRARIES = libgallium.la
+
+libgallium_la_CFLAGS = \
+   $(GALLIUM_CFLAGS)
+
+libgallium_la_SOURCES = \
+   $(C_SOURCES) \
+   $(GENERATED_SOURCES)
+
+if HAVE_MESA_LLVM
+
+libgallium_la_CFLAGS += \
+   $(LLVM_CFLAGS)
+
+libgallium_la_CXXFLAGS = \
+   $(LLVM_CXXFLAGS) \
+   $(GALLIUM_CFLAGS)
+
+libgallium_la_SOURCES += \
+   $(GALLIVM_SOURCES) \
+   $(GALLIVM_CPP_SOURCES)
+
+endif
+
+indices/u_indices_gen.c: indices/u_indices_gen.py
+   $(PYTHON2) $  $@
+
+indices/u_unfilled_gen.c: indices/u_unfilled_gen.py
+   $(PYTHON2) $  $@
+
+util/u_format_srgb.c: util/u_format_srgb.py
+   $(PYTHON2) $  $@
+
+util/u_format_table.c: util/u_format_table.py util/u_format_pack.py 
util/u_format_parse.py util/u_format.csv
+   $(PYTHON2) util/u_format_table.py util/u_format.csv  $@
+
+#XXX: Delete this when all targets are converted to automake.
+all-local: libgallium.la
+   ln -f $(builddir)/.libs/libgallium.a $(builddir)/libgallium.a
+
+# DO NOT DELETE 
-- 
1.7.6.5

___
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/mesa-dev

[Mesa-dev] [Bug 52064] New: build fails with git_sha1.h.tmp: permission denied

2012-07-13 Thread bugzilla-daemon 
https://bugs.freedesktop.org/show_bug.cgi?id=52064

 Bug #: 52064
   Summary: build fails with git_sha1.h.tmp: permission denied
Classification: Unclassified
   Product: Mesa
   Version: git
  Platform: Other
OS/Version: All
Status: NEW
  Severity: normal
  Priority: medium
 Component: Other
AssignedTo: mesa-dev@lists.freedesktop.org
ReportedBy: bpate...@gmail.com


This happens sometimes when building mesa. Somehow src/mesa/main/git_sha1.h.tmp
gets created with root user (necessary?) Then on a later build, Makefile can no
longer touch it:

Making all in mesa
make[2]: Entering directory `/home/bpaterni/usr/src/mesa/src/mesa'
touch: cannot touch `main/git_sha1.h.tmp': Permission denied
make[2]: *** [main/git_sha1.h.tmp] Error 1
make[2]: Leaving directory `/home/bpaterni/usr/src/mesa/src/mesa'
make[1]: *** [all-recursive] Error 1
make[1]: Leaving directory `/home/bpaterni/usr/src/mesa/src'
make: *** [all-recursive] Error 1

-- 
Configure bugmail: https://bugs.freedesktop.org/userprefs.cgi?tab=email
--- You are receiving this mail because: ---
You are the assignee for the bug.
___
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/mesa-dev

[Mesa-dev] r600g: hyperz

2012-07-13 Thread j . glisse 
So this patch add hyperz but does not enable it. I have been working on
that for the last 7 month i just fail at not making it lockup. Same time
i would prefer having this code upstream so i don't have to rebase.

I try to match fglrx sync  flush pattern but that would basicly mean
rewritting the whole r600g. So here is a cleanup of r600g flushing
i have been working on to try to fix lockup, but no success there
(slightly improve thing i think but when it comes to lockup it's
hard to have a metric on how more likely they are to happen or not)
http://people.freedesktop.org/~glisse/0002-r600g-simplify-and-fix-flushing-and-synchronization.patch

So if the feature doesn't lockup you will see on average 5% increase
in performance.

Anyway off to work on something else.

Cheers,
Jerome

___
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/mesa-dev

[Mesa-dev] [PATCH] r600g: add htile support v8

2012-07-13 Thread j . glisse 
From: Jerome Glisse jgli...@redhat.com

htile is used for HiZ and HiS support and fast Z/S clears.
This commit just adds the htile setup and Fast Z clear.
We don't take full advantage of HiS with that patch.

v2 really use fast clear, still random issue with some tiles
   need to try more flush combination, fix depth/stencil
   texture decompression
v3 fix random issue on r6xx/r7xx
v4 rebase on top of lastest mesa, disable CB export when clearing
   htile surface to avoid wasting bandwidth
v5 resummarize htile surface when uploading z value. Fix z/stencil
   decompression, the custom blitter with custom dsa is no longer
   needed.
v6 Reorganize render control/override update mecanism, fixing more
   issues in the process.
v7 Add nop after depth surface base update to work around some htile
   flushing issue. For htile to 8x8 on r6xx/r7xx as other combination
   have issue. Do not enable hyperz when flushing/uncompressing
   depth buffer.
v8 Fix htile surface, preload and prefetch setup. Only set preload
   and prefetch on htile surface clear like fglrx. Record depth
   clear value per level. Support several level for the htile
   surface. First depth clear can't be a fast clear.

Signed-off-by: Pierre-Eric Pelloux-Prayer pell...@gmail.com
Signed-off-by: Alex Deucher alexander.deuc...@amd.com
Signed-off-by: Jerome Glisse jgli...@redhat.com
---
 src/gallium/drivers/r600/evergreen_hw_context.c |8 +-
 src/gallium/drivers/r600/evergreen_state.c  |   97 -
 src/gallium/drivers/r600/evergreend.h   |4 +
 src/gallium/drivers/r600/r600_blit.c|   37 +--
 src/gallium/drivers/r600/r600_hw_context.c  |   25 +
 src/gallium/drivers/r600/r600_pipe.c|1 +
 src/gallium/drivers/r600/r600_pipe.h|   13 ++-
 src/gallium/drivers/r600/r600_resource.h|7 ++
 src/gallium/drivers/r600/r600_state.c   |  133 ---
 src/gallium/drivers/r600/r600_state_common.c|6 +
 src/gallium/drivers/r600/r600_texture.c |   98 +
 src/gallium/drivers/r600/r600d.h|6 +
 12 files changed, 376 insertions(+), 59 deletions(-)

diff --git a/src/gallium/drivers/r600/evergreen_hw_context.c 
b/src/gallium/drivers/r600/evergreen_hw_context.c
index 53d4582..546c884 100644
--- a/src/gallium/drivers/r600/evergreen_hw_context.c
+++ b/src/gallium/drivers/r600/evergreen_hw_context.c
@@ -43,7 +43,6 @@ static const struct r600_reg evergreen_ctl_const_list[] = {
 };
 
 static const struct r600_reg evergreen_context_reg_list[] = {
-   {R_028000_DB_RENDER_CONTROL, 0, 0},
{R_028008_DB_DEPTH_VIEW, 0, 0},
{R_028010_DB_RENDER_OVERRIDE2, 0, 0},
{GROUP_FORCE_NEW_BLOCK, 0, 0},
@@ -63,6 +62,9 @@ static const struct r600_reg evergreen_context_reg_list[] = {
{GROUP_FORCE_NEW_BLOCK, 0, 0},
{R_028058_DB_DEPTH_SIZE, 0, 0},
{R_02805C_DB_DEPTH_SLICE, 0, 0},
+   {R_02802C_DB_DEPTH_CLEAR, 0, 0},
+   {R_028ABC_DB_HTILE_SURFACE, 0, 0},
+   {R_028AC8_DB_PRELOAD_CONTROL, 0, 0},
{R_028204_PA_SC_WINDOW_SCISSOR_TL, 0, 0},
{R_028208_PA_SC_WINDOW_SCISSOR_BR, 0, 0},
{R_028234_PA_SU_HARDWARE_SCREEN_OFFSET, 0, 0},
@@ -301,7 +303,6 @@ static const struct r600_reg evergreen_context_reg_list[] = 
{
 };
 
 static const struct r600_reg cayman_context_reg_list[] = {
-   {R_028000_DB_RENDER_CONTROL, 0, 0},
{R_028008_DB_DEPTH_VIEW, 0, 0},
{R_028010_DB_RENDER_OVERRIDE2, 0, 0},
{GROUP_FORCE_NEW_BLOCK, 0, 0},
@@ -321,6 +322,9 @@ static const struct r600_reg cayman_context_reg_list[] = {
{GROUP_FORCE_NEW_BLOCK, 0, 0},
{R_028058_DB_DEPTH_SIZE, 0, 0},
{R_02805C_DB_DEPTH_SLICE, 0, 0},
+   {R_02802C_DB_DEPTH_CLEAR, 0, 0},
+   {R_028ABC_DB_HTILE_SURFACE, 0, 0},
+   {R_028AC8_DB_PRELOAD_CONTROL, 0, 0},
{R_028204_PA_SC_WINDOW_SCISSOR_TL, 0, 0},
{R_028208_PA_SC_WINDOW_SCISSOR_BR, 0, 0},
{R_028234_PA_SU_HARDWARE_SCREEN_OFFSET, 0, 0},
diff --git a/src/gallium/drivers/r600/evergreen_state.c 
b/src/gallium/drivers/r600/evergreen_state.c
index 404df02..9cadaa1 100644
--- a/src/gallium/drivers/r600/evergreen_state.c
+++ b/src/gallium/drivers/r600/evergreen_state.c
@@ -710,13 +710,15 @@ static void *evergreen_create_blend_state(struct 
pipe_context *ctx,
}
blend-cb_target_mask = target_mask;
 
-   if (target_mask)
+   if (target_mask) {
color_control |= S_028808_MODE(V_028808_CB_NORMAL);
-   else
+   } else {
color_control |= S_028808_MODE(V_028808_CB_DISABLE);
+   }
 
r600_pipe_state_add_reg(rstate, R_028808_CB_COLOR_CONTROL,
color_control);
+
/* only have dual source on MRT0 */
blend-dual_src_blend = util_blend_state_is_dual(state, 0);
for (int i = 0; i  8; i++) {
@@ -759,7 +761,6 @@ static void *evergreen_create_dsa_state(struct pipe_context 
*ctx,

[Mesa-dev] [PATCH] Fix build to use glsl_parser.hh instead of glsl_parser.h.

2012-07-13 Thread Marcin Baczyński 
Commit 68e04cc6014bf7a2c9bd0b3b783b4ec12aa2e824 changed .cpp - .cc,
but forgot to update references .h - .hh.

Also update Doxygen and .gitignore.

Signed-off-by: Marcin Baczyński marb...@gmail.com
---

Fixes a build failure for me when after configuring with

$ ./autogen.sh --prefix=/usr \
--with-dri-drivers=\
--with-gallium-drivers=r600,swrast\
--enable-texture-float\
--enable-glx-tls\
--enable-vdpau

make stops with

(...)
Making all in glsl
gmake[2]: Entering directory `/data/mesa/src/glsl'
gmake[2]: *** No rule to make target `glsl_parser.h', needed by `all'.  Stop.
gmake[2]: *** Waiting for unfinished jobs

 Makefile.am |4 ++--
 doxygen/glsl.doxy   |8 
 src/glsl/.gitignore |1 +
 src/glsl/Makefile.am|2 +-
 src/glsl/glsl_lexer.ll  |2 +-
 src/glsl/glsl_parser_extras.cpp |2 +-
 6 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index b2c810a..4d91ebb 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -59,7 +59,7 @@ EXTRA_FILES = \
aclocal.m4  \
configure   \
src/glsl/glsl_parser.cc \
-   src/glsl/glsl_parser.h  \
+   src/glsl/glsl_parser.hh \
src/glsl/glsl_lexer.cc  \
src/glsl/glcpp/glcpp-lex.c  \
src/glsl/glcpp/glcpp-parse.c\
@@ -80,7 +80,7 @@ IGNORE_FILES = \
 
 parsers: configure
-@touch $(top_builddir)/configs/current
-   $(MAKE) -C src/glsl glsl_parser.cc glsl_parser.h glsl_lexer.cc
+   $(MAKE) -C src/glsl glsl_parser.cc glsl_parser.hh glsl_lexer.cc
$(MAKE) -C src/glsl/glcpp glcpp-lex.c glcpp-parse.c glcpp-parse.h
$(MAKE) -C src/mesa program/lex.yy.c program/program_parse.tab.c 
program/program_parse.tab.h
 
diff --git a/doxygen/glsl.doxy b/doxygen/glsl.doxy
index 5411ec4..d110202 100644
--- a/doxygen/glsl.doxy
+++ b/doxygen/glsl.doxy
@@ -11,10 +11,10 @@ PROJECT_NAME   = Mesa GLSL module
 #---
 INPUT  = ../src/glsl/
 RECURSIVE  = NO
-EXCLUDE= ../src/glsl/glsl_lexer.cpp \
- ../src/glsl/glsl_lexer.h \
- ../src/glsl/glsl_parser.cpp \
- ../src/glsl/glsl_parser.h
+EXCLUDE= ../src/glsl/glsl_lexer.cc \
+ ../src/glsl/glsl_lexer.hh \
+ ../src/glsl/glsl_parser.cc \
+ ../src/glsl/glsl_parser.hh
 EXCLUDE_PATTERNS   =
 #---
 # configuration options related to the HTML output
diff --git a/src/glsl/.gitignore b/src/glsl/.gitignore
index c9a9f30..f79c2a9 100644
--- a/src/glsl/.gitignore
+++ b/src/glsl/.gitignore
@@ -4,6 +4,7 @@ glsl_lexer.cpp
 glsl_parser.cc
 glsl_parser.cpp
 glsl_parser.h
+glsl_parser.hh
 glsl_parser.output
 builtin_function.cpp
 builtin_compiler
diff --git a/src/glsl/Makefile.am b/src/glsl/Makefile.am
index 2b9ca2c..8db2802 100644
--- a/src/glsl/Makefile.am
+++ b/src/glsl/Makefile.am
@@ -87,7 +87,7 @@ builtin_compiler_SOURCES = \
 
 builtin_compiler_LDADD = libglslcommon.la
 
-BUILT_SOURCES = glsl_lexer.cc glsl_parser.cc glsl_parser.h builtin_function.cpp
+BUILT_SOURCES = glsl_lexer.cc glsl_parser.cc glsl_parser.hh 
builtin_function.cpp
 CLEANFILES = $(BUILT_SOURCES)
 
 builtin_function.cpp: builtins/profiles/* builtins/ir/* builtins/glsl/* 
builtins/tools/generate_builtins.py builtins/tools/texture_builtins.py 
builtin_compiler$(EXEEXT)
diff --git a/src/glsl/glsl_lexer.ll b/src/glsl/glsl_lexer.ll
index 24cda0c..64ce415 100644
--- a/src/glsl/glsl_lexer.ll
+++ b/src/glsl/glsl_lexer.ll
@@ -26,7 +26,7 @@
 #include strtod.h
 #include ast.h
 #include glsl_parser_extras.h
-#include glsl_parser.h
+#include glsl_parser.hh
 
 static int classify_identifier(struct _mesa_glsl_parse_state *, const char *);
 
diff --git a/src/glsl/glsl_parser_extras.cpp b/src/glsl/glsl_parser_extras.cpp
index d9ee406..9456825 100644
--- a/src/glsl/glsl_parser_extras.cpp
+++ b/src/glsl/glsl_parser_extras.cpp
@@ -32,7 +32,7 @@ extern C {
 #include ralloc.h
 #include ast.h
 #include glsl_parser_extras.h
-#include glsl_parser.h
+#include glsl_parser.hh
 #include ir_optimization.h
 #include loop_analysis.h
 
-- 
1.7.8.6

___
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/mesa-dev

Re: [Mesa-dev] [PATCH 0/5] First batch of gm45 clipping/interpolation fixes

2012-07-13 Thread Kenneth Graunke 
On 07/13/2012 12:20 AM, Olivier Galibert wrote:
 On Sat, Jun 30, 2012 at 08:50:10PM +0200, Olivier Galibert wrote:
 This is the first part of the fixes I've done to make my gm45 work
 correctly w.r.t clipping and interpolation.  There's a fair chance
 they work for everything gen 4/5, but I have no way to be sure.
 
 So, not even one comment, nothing?
 
   OG.

Sorry...been really busy, and most of us haven't actually spent much if
any time in the clipper shaders.  I'll try and review it within a week.

Despite the lack of response, I am really excited to see that you're
working on this---this is a huge step toward bringing GL 3.x back to
Gen4/5, and we're all really glad to see it happen!
___
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/mesa-dev

[Mesa-dev] [PATCH] src/glsl/Makefile.am: Fix for automake-1.12 C++ yacc header file naming change

2012-07-13 Thread Jon TURNEY 
Commit 68e04cc6 was tested using automake-1.11.  Unfortunately, automake-1.12
made a slightly backward-incompatible change in the use of yacc with C++, and
for a .yy file, the generated header file is now .hh, not .h

To work with both, write our own rule for running yacc, which generates a
header file named .h, rather than using automake's rule.

Also, remove things from BUILD_SOURCES which don't need to be there

mattst88 doen't like this approach and wants to do something cunning with
symlinks instead, so this is just a placeholder until that turns up :-)

Signed-off-by: Jon TURNEY jon.tur...@dronecode.org.uk
---
 src/glsl/Makefile.am |   14 ++
 1 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/src/glsl/Makefile.am b/src/glsl/Makefile.am
index 2b9ca2c..a3f0c7a 100644
--- a/src/glsl/Makefile.am
+++ b/src/glsl/Makefile.am
@@ -37,7 +37,6 @@ AM_CFLAGS = \
 
 AM_CXXFLAGS = $(AM_CFLAGS)
 
-AM_YFLAGS = -v -d -p _mesa_glsl_
 AM_LFLAGS = --nounistd -o$(LEX_OUTPUT_ROOT).c
 
 GLSL_SRCDIR=$(top_srcdir)/src/glsl
@@ -49,10 +48,12 @@ noinst_PROGRAMS = glsl_compiler glsl_test builtin_compiler
 # common sources for builtin_compiler and libglsl
 libglslcommon_la_SOURCES = \
glsl_lexer.ll \
-   glsl_parser.yy \
$(LIBGLSL_FILES) \
$(LIBGLSL_CXX_FILES)
 
+nodist_libglslcommon_la_SOURCES = \
+   glsl_parser.cc
+
 libglslcommon_la_LIBADD = glcpp/libglcpp.la
 
 # common sources for builtin_compiler and glsl_compiler
@@ -87,8 +88,13 @@ builtin_compiler_SOURCES = \
 
 builtin_compiler_LDADD = libglslcommon.la
 
-BUILT_SOURCES = glsl_lexer.cc glsl_parser.cc glsl_parser.h builtin_function.cpp
-CLEANFILES = $(BUILT_SOURCES)
+# automake =1.11 and automake =1.12 have different conventions for naming 
C++ header files
+# made by yacc.  To work with both, we write our own rule rather than using 
automake's.
+glsl_parser.cc glsl_parser.h: glsl_parser.yy
+   $(AM_V_GEN) $(YACC) -v -o glsl_parser.cc -p _mesa_glsl_ 
--defines=glsl_parser.h $
+
+BUILT_SOURCES = glsl_parser.h builtin_function.cpp
+CLEANFILES = glsl_lexer.cc glsl_parser.cc $(BUILT_SOURCES)
 
 builtin_function.cpp: builtins/profiles/* builtins/ir/* builtins/glsl/* 
builtins/tools/generate_builtins.py builtins/tools/texture_builtins.py 
builtin_compiler$(EXEEXT)
$(AM_V_GEN) $(PYTHON2) $(PYTHON_FLAGS) 
builtins/tools/generate_builtins.py ./builtin_compiler  builtin_function.cpp 
|| rm -f builtin_function.cpp
-- 
1.7.9

___
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/mesa-dev

Re: [Mesa-dev] [PATCH] Fix build to use glsl_parser.hh instead of glsl_parser.h.

2012-07-13 Thread Jon TURNEY 
On 13/07/2012 22:23, Marcin Baczyński wrote:
 Commit 68e04cc6014bf7a2c9bd0b3b783b4ec12aa2e824 changed .cpp - .cc,
 but forgot to update references .h - .hh.
 
 Also update Doxygen and .gitignore.
 
 Signed-off-by: Marcin Baczyński marb...@gmail.com

Thanks, and sorry for the breakage.

But this patch isn't right, as the name of the header file depends on the
automake version. While automake 1.12 names the output .hh, earlier versions
named the output .h, which is very inconvenient and why this wasn't spotted in
testing :-(

doxygen/glsl.doxy exclude definitely needs updating though, thanks for
spotting that.
___
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/mesa-dev

Re: [Mesa-dev] [PATCH] r600g: add htile support v8

2012-07-13 Thread Marek Olšák 
Hi Jerome,

I have a lot of remarks.

1) The DB decompression fix (where you update DB_RENDER_CONTROL) could
be in a separate patch.

2) The fix with EARLY_Z_THEN_LATE_Z (in update_dual_export) could also
be in a separate patch.

3) r600_context::use_hyperz is set to FALSE by default, why? If the
fast clear works and there are no piglit regressions, then please
enable it. If the fast clear doesn't work reliably, please put it in a
branch. Merging non-working code on purpose is a very bad idea.

4) The depth clear value should be per-layer in addition to being
per-level. Otherwise, cubemaps and texture arrays would be broken.

5) You added r600_db_misc_state::resummarize, but it's unused. Please
pay attention to detail.

Also there are additional comments inline below.

On Fri, Jul 13, 2012 at 8:30 PM,  j.gli...@gmail.com wrote:
 From: Jerome Glisse jgli...@redhat.com

 htile is used for HiZ and HiS support and fast Z/S clears.
 This commit just adds the htile setup and Fast Z clear.
 We don't take full advantage of HiS with that patch.

 v2 really use fast clear, still random issue with some tiles
need to try more flush combination, fix depth/stencil
texture decompression
 v3 fix random issue on r6xx/r7xx
 v4 rebase on top of lastest mesa, disable CB export when clearing
htile surface to avoid wasting bandwidth
 v5 resummarize htile surface when uploading z value. Fix z/stencil
decompression, the custom blitter with custom dsa is no longer
needed.
 v6 Reorganize render control/override update mecanism, fixing more
issues in the process.
 v7 Add nop after depth surface base update to work around some htile
flushing issue. For htile to 8x8 on r6xx/r7xx as other combination
have issue. Do not enable hyperz when flushing/uncompressing
depth buffer.
 v8 Fix htile surface, preload and prefetch setup. Only set preload
and prefetch on htile surface clear like fglrx. Record depth
clear value per level. Support several level for the htile
surface. First depth clear can't be a fast clear.

 Signed-off-by: Pierre-Eric Pelloux-Prayer pell...@gmail.com
 Signed-off-by: Alex Deucher alexander.deuc...@amd.com
 Signed-off-by: Jerome Glisse jgli...@redhat.com
 ---
  src/gallium/drivers/r600/evergreen_hw_context.c |8 +-
  src/gallium/drivers/r600/evergreen_state.c  |   97 -
  src/gallium/drivers/r600/evergreend.h   |4 +
  src/gallium/drivers/r600/r600_blit.c|   37 +--
  src/gallium/drivers/r600/r600_hw_context.c  |   25 +
  src/gallium/drivers/r600/r600_pipe.c|1 +
  src/gallium/drivers/r600/r600_pipe.h|   13 ++-
  src/gallium/drivers/r600/r600_resource.h|7 ++
  src/gallium/drivers/r600/r600_state.c   |  133 
 ---
  src/gallium/drivers/r600/r600_state_common.c|6 +
  src/gallium/drivers/r600/r600_texture.c |   98 +
  src/gallium/drivers/r600/r600d.h|6 +
  12 files changed, 376 insertions(+), 59 deletions(-)

 diff --git a/src/gallium/drivers/r600/evergreen_hw_context.c 
 b/src/gallium/drivers/r600/evergreen_hw_context.c
 index 53d4582..546c884 100644
 --- a/src/gallium/drivers/r600/evergreen_hw_context.c
 +++ b/src/gallium/drivers/r600/evergreen_hw_context.c
 @@ -43,7 +43,6 @@ static const struct r600_reg evergreen_ctl_const_list[] = {
  };

  static const struct r600_reg evergreen_context_reg_list[] = {
 -   {R_028000_DB_RENDER_CONTROL, 0, 0},
 {R_028008_DB_DEPTH_VIEW, 0, 0},
 {R_028010_DB_RENDER_OVERRIDE2, 0, 0},
 {GROUP_FORCE_NEW_BLOCK, 0, 0},
 @@ -63,6 +62,9 @@ static const struct r600_reg evergreen_context_reg_list[] = 
 {
 {GROUP_FORCE_NEW_BLOCK, 0, 0},
 {R_028058_DB_DEPTH_SIZE, 0, 0},
 {R_02805C_DB_DEPTH_SLICE, 0, 0},
 +   {R_02802C_DB_DEPTH_CLEAR, 0, 0},
 +   {R_028ABC_DB_HTILE_SURFACE, 0, 0},
 +   {R_028AC8_DB_PRELOAD_CONTROL, 0, 0},
 {R_028204_PA_SC_WINDOW_SCISSOR_TL, 0, 0},
 {R_028208_PA_SC_WINDOW_SCISSOR_BR, 0, 0},
 {R_028234_PA_SU_HARDWARE_SCREEN_OFFSET, 0, 0},
 @@ -301,7 +303,6 @@ static const struct r600_reg evergreen_context_reg_list[] 
 = {
  };

  static const struct r600_reg cayman_context_reg_list[] = {
 -   {R_028000_DB_RENDER_CONTROL, 0, 0},
 {R_028008_DB_DEPTH_VIEW, 0, 0},
 {R_028010_DB_RENDER_OVERRIDE2, 0, 0},
 {GROUP_FORCE_NEW_BLOCK, 0, 0},
 @@ -321,6 +322,9 @@ static const struct r600_reg cayman_context_reg_list[] = {
 {GROUP_FORCE_NEW_BLOCK, 0, 0},
 {R_028058_DB_DEPTH_SIZE, 0, 0},
 {R_02805C_DB_DEPTH_SLICE, 0, 0},
 +   {R_02802C_DB_DEPTH_CLEAR, 0, 0},
 +   {R_028ABC_DB_HTILE_SURFACE, 0, 0},
 +   {R_028AC8_DB_PRELOAD_CONTROL, 0, 0},
 {R_028204_PA_SC_WINDOW_SCISSOR_TL, 0, 0},
 {R_028208_PA_SC_WINDOW_SCISSOR_BR, 0, 0},
 {R_028234_PA_SU_HARDWARE_SCREEN_OFFSET, 0, 0},
 diff --git

Re: [Mesa-dev] r600g: hyperz

2012-07-13 Thread Marek Olšák 
Hi Jerome,

I couldn't open the patch, because freedesktop.org doesn't seem to
work for me today, it always times out.

Anyway, non-working code shouldn't be merged into Mesa master, because
it decreases the quality of the driver and is a pain to maintain. As
as I said in another email, merging non-working code on purpose is a
very bad idea. Please don't do it.

Marek

On Fri, Jul 13, 2012 at 8:30 PM,  j.gli...@gmail.com wrote:
 So this patch add hyperz but does not enable it. I have been working on
 that for the last 7 month i just fail at not making it lockup. Same time
 i would prefer having this code upstream so i don't have to rebase.

 I try to match fglrx sync  flush pattern but that would basicly mean
 rewritting the whole r600g. So here is a cleanup of r600g flushing
 i have been working on to try to fix lockup, but no success there
 (slightly improve thing i think but when it comes to lockup it's
 hard to have a metric on how more likely they are to happen or not)
 http://people.freedesktop.org/~glisse/0002-r600g-simplify-and-fix-flushing-and-synchronization.patch

 So if the feature doesn't lockup you will see on average 5% increase
 in performance.

 Anyway off to work on something else.

 Cheers,
 Jerome

 ___
 mesa-dev mailing list
 mesa-dev@lists.freedesktop.org
 http://lists.freedesktop.org/mailman/listinfo/mesa-dev
___
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/mesa-dev

Re: [Mesa-dev] r600g: hyperz

2012-07-13 Thread Jerome Glisse 
On Fri, Jul 13, 2012 at 8:08 PM, Marek Olšák mar...@gmail.com wrote:
 Hi Jerome,

 I couldn't open the patch, because freedesktop.org doesn't seem to
 work for me today, it always times out.

 Anyway, non-working code shouldn't be merged into Mesa master, because
 it decreases the quality of the driver and is a pain to maintain. As
 as I said in another email, merging non-working code on purpose is a
 very bad idea. Please don't do it.

 Marek

Code works, no regression, but if you enable hyperz get ready to
experience lockup, likelyhood depends on what you are doing.

So no i don't consider this a non working code. It does work and
doesn't regress.

Cheers,
Jerome
___
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/mesa-dev

Re: [Mesa-dev] [PATCH] r600g: add htile support v8

2012-07-13 Thread Marek Olšák 
On Sat, Jul 14, 2012 at 2:20 AM, Jerome Glisse j.gli...@gmail.com wrote:
 On Fri, Jul 13, 2012 at 8:02 PM, Marek Olšák mar...@gmail.com wrote:
 I don't like this 0xf magic value. Please use proper definitions from 
 r600d.h.


 Using define will make it a very big line.

Yes, a very big line is okay. It took me a while to realize what 0xf
means. I am sure others would appreciate it too.

Marek
___
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/mesa-dev