Mesa (master): i915g: Update TODO

2013-03-08 Thread Stephane Marchesin 
Module: Mesa
Branch: master
Commit: d815e8af3944bca5eac7a0638da5529596735aef
URL:
http://cgit.freedesktop.org/mesa/mesa/commit/?id=d815e8af3944bca5eac7a0638da5529596735aef

Author: Stéphane Marchesin marc...@chromium.org
Date:   Fri Mar  8 16:16:33 2013 -0800

i915g: Update TODO

---

 src/gallium/drivers/i915/TODO |   13 +
 1 files changed, 1 insertions(+), 12 deletions(-)

diff --git a/src/gallium/drivers/i915/TODO b/src/gallium/drivers/i915/TODO
index c72f09a..8856a7e 100644
--- a/src/gallium/drivers/i915/TODO
+++ b/src/gallium/drivers/i915/TODO
@@ -1,19 +1,11 @@
 Random list of problems with i915g:
 
-- Add support for PIPE_CAP_POINT_SPRITE either via the draw module or directly
-  via the hardware, look at the classic driver, more advanced.
-
 - What does this button do? Figure out LIS7 with regards to depth offset.
 
 - Dies with BadDrawable on GLXFBconfig changes/destruction. Makes piglit 
totally
   unusable :( Upgrading xserver helped here, it doesn't crash anymore. Still
   broken, it doesn't update the viewport/get new buffers.
 
-- Kills the chip in 3D_PRIMITIVE LINELIST with mesa-demos/fbotexture in
-  wireframe mode. Changing the cullmode to cw from none mitigates the crash. As
-  does emitting only one line segment (2 indices) per 3D_PRIMITIVE command in
-  the batch.
-
 - Y-tiling is even more fun. i915c doesn't use it, maybe there's a reason?
   Texture sampling from Y-tiled buffers seems to work, though (save above
   problems).
@@ -34,16 +26,13 @@ Random list of problems with i915g:
 
 - Replace constants and immediates which are 0,1,-1 or a combination of those 
with a swizzle.
 
-- i915_delete_fs_state doesn't call draw_delete_fragment_shader. Why?
-
 - Schedule instructions to minimize the number of phases. One way is to replace
   R registers responsible for a boundary with U registers to avoid phase
   boundaries.
 
 - Continue a previous primitive when there are no state changes
 
-- Switch to the blitter for those buggy blit copies
-- Or state save/restore has a bug with u_blitter, fix it.
+- Fix fragment discard
 
 Other bugs can be found here:
 
https://bugs.freedesktop.org/buglist.cgi?bug_status=NEWbug_status=ASSIGNEDbug_status=REOPENEDcomponent=Drivers/Gallium/i915g

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

Mesa (master): i915g: Use PIPE_FLUSH_END_OF_FRAME to trigger throttling

2013-03-08 Thread Stephane Marchesin 
Module: Mesa
Branch: master
Commit: 1662178863d7b715530274148aa57e6494f935a8
URL:
http://cgit.freedesktop.org/mesa/mesa/commit/?id=1662178863d7b715530274148aa57e6494f935a8

Author: Stéphane Marchesin marc...@chromium.org
Date:   Fri Mar  8 13:32:55 2013 -0800

i915g: Use PIPE_FLUSH_END_OF_FRAME to trigger throttling

This helps with jittering, instead of throttling at every command
buffer we only throttle once a frame.

---

 src/gallium/drivers/i915/i915_batch.h  |8 +---
 src/gallium/drivers/i915/i915_blit.c   |8 
 src/gallium/drivers/i915/i915_clear.c  |6 +++---
 src/gallium/drivers/i915/i915_flush.c  |   16 ++--
 src/gallium/drivers/i915/i915_prim_emit.c  |2 +-
 src/gallium/drivers/i915/i915_prim_vbuf.c  |6 +++---
 src/gallium/drivers/i915/i915_state_emit.c |4 ++--
 src/gallium/drivers/i915/i915_winsys.h |9 -
 src/gallium/winsys/i915/drm/i915_drm_batchbuffer.c |8 +---
 src/gallium/winsys/i915/sw/i915_sw_batchbuffer.c   |3 ++-
 10 files changed, 43 insertions(+), 27 deletions(-)

diff --git a/src/gallium/drivers/i915/i915_batch.h 
b/src/gallium/drivers/i915/i915_batch.h
index 0cb5801..5f2b324 100644
--- a/src/gallium/drivers/i915/i915_batch.h
+++ b/src/gallium/drivers/i915/i915_batch.h
@@ -47,12 +47,14 @@
 #define OUT_RELOC_FENCED(buf, usage, offset) \
i915_winsys_batchbuffer_reloc(i915-batch, buf, usage, offset, true)
 
-#define FLUSH_BATCH(fence) \
-   i915_flush(i915, fence)
+#define FLUSH_BATCH(fence, flags) \
+   i915_flush(i915, fence, flags)
 
 /
  * i915_flush.c
  */
-void i915_flush(struct i915_context *i915, struct pipe_fence_handle **fence);
+extern void i915_flush(struct i915_context *i915,
+   struct pipe_fence_handle **fence,
+   enum pipe_flush_flags flags);
 
 #endif
diff --git a/src/gallium/drivers/i915/i915_blit.c 
b/src/gallium/drivers/i915/i915_blit.c
index baaed37..ff81439 100644
--- a/src/gallium/drivers/i915/i915_blit.c
+++ b/src/gallium/drivers/i915/i915_blit.c
@@ -50,7 +50,7 @@ i915_fill_blit(struct i915_context *i915,
 __FUNCTION__, dst_buffer, dst_pitch, dst_offset, x, y, w, h);
 
if(!i915_winsys_validate_buffers(i915-batch, dst_buffer, 1)) {
-  FLUSH_BATCH(NULL);
+  FLUSH_BATCH(NULL, I915_FLUSH_ASYNC);
   assert(i915_winsys_validate_buffers(i915-batch, dst_buffer, 1));
}
 
@@ -72,7 +72,7 @@ i915_fill_blit(struct i915_context *i915,
}
 
if (!BEGIN_BATCH(6)) {
-  FLUSH_BATCH(NULL);
+  FLUSH_BATCH(NULL, I915_FLUSH_ASYNC);
   assert(BEGIN_BATCH(6));
}
OUT_BATCH(CMD);
@@ -111,7 +111,7 @@ i915_copy_blit(struct i915_context *i915,
 dst_buffer, dst_pitch, dst_offset, dst_x, dst_y, w, h);
 
if(!i915_winsys_validate_buffers(i915-batch, buffers, 2)) {
-  FLUSH_BATCH(NULL);
+  FLUSH_BATCH(NULL, I915_FLUSH_ASYNC);
   assert(i915_winsys_validate_buffers(i915-batch, buffers, 2));
}
 
@@ -144,7 +144,7 @@ i915_copy_blit(struct i915_context *i915,
assert (dst_pitch  0  src_pitch  0);
 
if (!BEGIN_BATCH(8)) {
-  FLUSH_BATCH(NULL);
+  FLUSH_BATCH(NULL, I915_FLUSH_ASYNC);
   assert(BEGIN_BATCH(8));
}
OUT_BATCH(CMD);
diff --git a/src/gallium/drivers/i915/i915_clear.c 
b/src/gallium/drivers/i915/i915_clear.c
index 30a3926..af75b85 100644
--- a/src/gallium/drivers/i915/i915_clear.c
+++ b/src/gallium/drivers/i915/i915_clear.c
@@ -123,7 +123,7 @@ i915_clear_emit(struct pipe_context *pipe, unsigned buffers,
  i915_emit_hardware_state(i915);
 
   if (!BEGIN_BATCH(1 + 2*(7 + 7))) {
- FLUSH_BATCH(NULL);
+ FLUSH_BATCH(NULL, I915_FLUSH_ASYNC);
 
  i915_emit_hardware_state(i915);
  i915-vbo_flushed = 1;
@@ -174,7 +174,7 @@ i915_clear_emit(struct pipe_context *pipe, unsigned buffers,
  i915_emit_hardware_state(i915);
 
   if (!BEGIN_BATCH(1 + 7 + 7)) {
- FLUSH_BATCH(NULL);
+ FLUSH_BATCH(NULL, I915_FLUSH_ASYNC);
 
  i915_emit_hardware_state(i915);
  i915-vbo_flushed = 1;
@@ -206,7 +206,7 @@ i915_clear_emit(struct pipe_context *pipe, unsigned buffers,
/* Flush after clear, its expected to be a costly operation.
 * This is not required, just a heuristic, but without the flush we'd need 
to
 * clobber the SCISSOR_ENABLE dynamic state. */
-   FLUSH_BATCH(NULL);
+   FLUSH_BATCH(NULL, I915_FLUSH_ASYNC);
 
i915-last_fired_vertices = i915-fired_vertices;
i915-fired_vertices = 0;
diff --git a/src/gallium/drivers/i915/i915_flush.c 
b/src/gallium/drivers/i915/i915_flush.c
index d44b6f7..3db6ca1 100644
--- a/src/gallium/drivers/i915/i915_flush.c
+++ b/src/gallium/drivers/i915/i915_flush.c
@@ -33,9 +33,9 @@
 #include pipe/p_defines.h
 #include draw/draw_context.h
 #include i915_context.h
-#include i915_reg.h
 #include

Mesa (master): mesa: Allow ETC2/EAC formats with ARB_ES3_compatibility.

2013-03-08 Thread Matt Turner 
Module: Mesa
Branch: master
Commit: 79a09772414b7c4d1632f66d2fd0e7a9bc912ac3
URL:
http://cgit.freedesktop.org/mesa/mesa/commit/?id=79a09772414b7c4d1632f66d2fd0e7a9bc912ac3

Author: Matt Turner matts...@gmail.com
Date:   Mon Mar  4 11:32:32 2013 -0800

mesa: Allow ETC2/EAC formats with ARB_ES3_compatibility.

Fixes piglit's oes_compressed_etc2_texture-miptree tests on Desktop GL.
Reported-by: Marek Olšák mar...@gmail.com
Reviewed-by: Anuj Phogat anuj.pho...@gmail.com

---

 src/mesa/main/glformats.c |2 +-
 src/mesa/main/teximage.c  |2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/mesa/main/glformats.c b/src/mesa/main/glformats.c
index 8728540..c1e1658 100644
--- a/src/mesa/main/glformats.c
+++ b/src/mesa/main/glformats.c
@@ -917,7 +917,7 @@ _mesa_is_compressed_format(struct gl_context *ctx, GLenum 
format)
case GL_COMPRESSED_SIGNED_RG11_EAC:
case GL_COMPRESSED_RGB8_PUNCHTHROUGH_ALPHA1_ETC2:
case GL_COMPRESSED_SRGB8_PUNCHTHROUGH_ALPHA1_ETC2:
-  return _mesa_is_gles3(ctx);
+  return _mesa_is_gles3(ctx) || ctx-Extensions.ARB_ES3_compatibility;
case GL_PALETTE4_RGB8_OES:
case GL_PALETTE4_RGBA8_OES:
case GL_PALETTE4_R5_G6_B5_OES:
diff --git a/src/mesa/main/teximage.c b/src/mesa/main/teximage.c
index 9d4a170..7d996da 100644
--- a/src/mesa/main/teximage.c
+++ b/src/mesa/main/teximage.c
@@ -520,7 +520,7 @@ _mesa_base_tex_format( struct gl_context *ctx, GLint 
internalFormat )
   }
}
 
-   if (_mesa_is_gles3(ctx)) {
+   if (_mesa_is_gles3(ctx) || ctx-Extensions.ARB_ES3_compatibility) {
   switch (internalFormat) {
   case GL_COMPRESSED_RGB8_ETC2:
   case GL_COMPRESSED_SRGB8_ETC2:

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

Mesa (master): configure.ac: Remove redundant checks of enable_dri.

2013-03-08 Thread Matt Turner 
Module: Mesa
Branch: master
Commit: 7de78ce5e5f5dc635846a3d935aaf2f4407e2dfa
URL:
http://cgit.freedesktop.org/mesa/mesa/commit/?id=7de78ce5e5f5dc635846a3d935aaf2f4407e2dfa

Author: Matt Turner matts...@gmail.com
Date:   Tue Mar  5 10:27:22 2013 -0800

configure.ac: Remove redundant checks of enable_dri.

The whole block is enclosed inside if test x$enable_dri = xyes.

---

 configure.ac |   34 --
 1 files changed, 16 insertions(+), 18 deletions(-)

diff --git a/configure.ac b/configure.ac
index ea56a04..925dc6b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1062,26 +1062,24 @@ if test x$enable_dri = xyes; then
 DRI_DIRS=`echo $DRI_DIRS | $SED 's/  */ /g'`
 
 # Check for expat
-if test x$enable_dri = xyes; then
-EXPAT_INCLUDES=
-EXPAT_LIB=-lexpat
-AC_ARG_WITH([expat],
-[AS_HELP_STRING([--with-expat=DIR],
-[expat install directory])],[
-EXPAT_INCLUDES=-I$withval/include
-CPPFLAGS=$CPPFLAGS $EXPAT_INCLUDES
-LDFLAGS=$LDFLAGS -L$withval/$LIB_DIR
-EXPAT_LIB=-L$withval/$LIB_DIR -lexpat
-])
-AC_CHECK_HEADER([expat.h],[],[AC_MSG_ERROR([Expat required for DRI.])])
-   save_LIBS=$LIBS
-AC_CHECK_LIB([expat],[XML_ParserCreate],[],
-[AC_MSG_ERROR([Expat required for DRI.])])
-   LIBS=$save_LIBS
-fi
+EXPAT_INCLUDES=
+EXPAT_LIB=-lexpat
+AC_ARG_WITH([expat],
+[AS_HELP_STRING([--with-expat=DIR],
+[expat install directory])],[
+EXPAT_INCLUDES=-I$withval/include
+CPPFLAGS=$CPPFLAGS $EXPAT_INCLUDES
+LDFLAGS=$LDFLAGS -L$withval/$LIB_DIR
+EXPAT_LIB=-L$withval/$LIB_DIR -lexpat
+])
+AC_CHECK_HEADER([expat.h],[],[AC_MSG_ERROR([Expat required for DRI.])])
+save_LIBS=$LIBS
+AC_CHECK_LIB([expat],[XML_ParserCreate],[],
+[AC_MSG_ERROR([Expat required for DRI.])])
+LIBS=$save_LIBS
 
 # if we are building any dri driver other than swrast or using the dri 
state tracker ...
-if test -n $DRI_DIRS -a x$DRI_DIRS != xswrast -a x$enable_dri = 
xyes; then
+if test -n $DRI_DIRS -a x$DRI_DIRS != xswrast; then
 # ... libdrm is required
 if test x$have_libdrm != xyes; then
 AC_MSG_ERROR([DRI drivers requires libdrm = $LIBDRM_REQUIRED])

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

Mesa (master): gallium/util: Correct shift value for TSC feature detection.

2013-03-08 Thread Matt Turner 
Module: Mesa
Branch: master
Commit: ba588dd45d584db8e2e090b4bce342128e167aec
URL:
http://cgit.freedesktop.org/mesa/mesa/commit/?id=ba588dd45d584db8e2e090b4bce342128e167aec

Author: Maxence Le Doré maxence.led...@gmail.com
Date:   Thu Mar  7 02:30:03 2013 +0100

gallium/util: Correct shift value for TSC feature detection.

Reviewed-by: Matt Turner matts...@gmail.com

---

 src/gallium/auxiliary/util/u_cpu_detect.c |2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/src/gallium/auxiliary/util/u_cpu_detect.c 
b/src/gallium/auxiliary/util/u_cpu_detect.c
index d7f0be4..0328051 100644
--- a/src/gallium/auxiliary/util/u_cpu_detect.c
+++ b/src/gallium/auxiliary/util/u_cpu_detect.c
@@ -270,7 +270,7 @@ util_cpu_detect(void)
  util_cpu_caps.x86_cpu_type = 8 + ((regs2[0]  20)  255); /* use 
extended family (P4, IA64) */
 
  /* general feature flags */
- util_cpu_caps.has_tsc= (regs2[3]   8)  1; /* 0x010 */
+ util_cpu_caps.has_tsc= (regs2[3]   4)  1; /* 0x010 */
  util_cpu_caps.has_mmx= (regs2[3]  23)  1; /* 0x080 */
  util_cpu_caps.has_sse= (regs2[3]  25)  1; /* 0x200 */
  util_cpu_caps.has_sse2   = (regs2[3]  26)  1; /* 0x400 */

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

Mesa (master): configure.ac: Build dricommon for DRI gallium drivers

2013-03-08 Thread Matt Turner 
Module: Mesa
Branch: master
Commit: 07f2dee7319b084e00288d74b29b07b62d888948
URL:
http://cgit.freedesktop.org/mesa/mesa/commit/?id=07f2dee7319b084e00288d74b29b07b62d888948

Author: Matt Turner matts...@gmail.com
Date:   Tue Mar  5 10:25:55 2013 -0800

configure.ac: Build dricommon for DRI gallium drivers

Commit 67ef7559 added an || test x$enable_dri check in an attempt to
get the DRI common bits built in some necessary cases. That change was
inappropriate as it made these common DRI pieces be built
unconditionally, so some builds were broken.

Subsequently, commit 998d975e3 change the || test to a -a
conjunction within the existing test invocation. This made the '-a
x$enable_dri = xyes' clause have no effect, (as it was inside an
enclosing test for the same condition). So the new breakage from
commit 67ef7559 was addressed, but the original problems were
regressed.

The immediately preceding commit removed the redundant condition.

Now, finally this commit fixes the original problem as described in
the commit message of 67ef7559: this code should be compiled when
using the DRI state tracker. In order to do so, the HAVE_*_DRI
conditionals must be moved after the last assignment of HAVE_COMMON_DRI.

Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=61821
Tested-by: Stéphane Marchesin marc...@chromium.org

---

 configure.ac |   19 ++-
 1 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/configure.ac b/configure.ac
index 925dc6b..3204869 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1078,7 +1078,7 @@ if test x$enable_dri = xyes; then
 [AC_MSG_ERROR([Expat required for DRI.])])
 LIBS=$save_LIBS
 
-# if we are building any dri driver other than swrast or using the dri 
state tracker ...
+# If we are building any DRI driver other than swrast.
 if test -n $DRI_DIRS -a x$DRI_DIRS != xswrast; then
 # ... libdrm is required
 if test x$have_libdrm != xyes; then
@@ -1147,14 +1147,6 @@ case $DRI_DIRS in
 ;;
 esac
 
-AM_CONDITIONAL(HAVE_I915_DRI, test x$HAVE_I915_DRI = xyes)
-AM_CONDITIONAL(HAVE_I965_DRI, test x$HAVE_I965_DRI = xyes)
-AM_CONDITIONAL(HAVE_NOUVEAU_DRI, test x$HAVE_NOUVEAU_DRI = xyes)
-AM_CONDITIONAL(HAVE_R200_DRI, test x$HAVE_R200_DRI = xyes)
-AM_CONDITIONAL(HAVE_RADEON_DRI, test x$HAVE_RADEON_DRI = xyes)
-AM_CONDITIONAL(HAVE_SWRAST_DRI, test x$HAVE_SWRAST_DRI = xyes)
-AM_CONDITIONAL(HAVE_COMMON_DRI, test x$HAVE_COMMON_DRI = xyes)
-
 dnl
 dnl OSMesa configuration
 dnl
@@ -1753,6 +1745,7 @@ gallium_check_st() {
 fi
 if test x$HAVE_ST_DRI = xyes  test x$2 != x; then
  GALLIUM_TARGET_DIRS=$GALLIUM_TARGET_DIRS $2
+ HAVE_COMMON_DRI=yes
 fi
 if test x$HAVE_ST_XORG = xyes  test x$3 != x; then
  GALLIUM_TARGET_DIRS=$GALLIUM_TARGET_DIRS $3
@@ -1994,6 +1987,14 @@ for driver in $GALLIUM_DRIVERS_DIRS; do
 esac
 done
 
+AM_CONDITIONAL(HAVE_I915_DRI, test x$HAVE_I915_DRI = xyes)
+AM_CONDITIONAL(HAVE_I965_DRI, test x$HAVE_I965_DRI = xyes)
+AM_CONDITIONAL(HAVE_NOUVEAU_DRI, test x$HAVE_NOUVEAU_DRI = xyes)
+AM_CONDITIONAL(HAVE_R200_DRI, test x$HAVE_R200_DRI = xyes)
+AM_CONDITIONAL(HAVE_RADEON_DRI, test x$HAVE_RADEON_DRI = xyes)
+AM_CONDITIONAL(HAVE_SWRAST_DRI, test x$HAVE_SWRAST_DRI = xyes)
+AM_CONDITIONAL(HAVE_COMMON_DRI, test x$HAVE_COMMON_DRI = xyes)
+
 AM_CONDITIONAL(HAVE_GALAHAD_GALLIUM, test x$HAVE_GALAHAD_GALLIUM = xyes)
 AM_CONDITIONAL(HAVE_IDENTITY_GALLIUM, test x$HAVE_IDENTITY_GALLIUM = xyes)
 AM_CONDITIONAL(HAVE_NOOP_GALLIUM, test x$HAVE_NOOP_GALLIUM = xyes)

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

Mesa (master): i965: Link i965_dri.so with C++ linker.

2013-03-08 Thread Matt Turner 
Module: Mesa
Branch: master
Commit: 89559c50e7ea9f6571eb02477d7b466f3354ae2f
URL:
http://cgit.freedesktop.org/mesa/mesa/commit/?id=89559c50e7ea9f6571eb02477d7b466f3354ae2f

Author: Frank Henigman fjhenig...@google.com
Date:   Thu Feb 28 21:21:51 2013 -0500

i965: Link i965_dri.so with C++ linker.

Force C++ linking of i965_dri.so by adding a dummy C++ source file.

Reviewed-by: Matt Turner matts...@gmail.com

---

 src/mesa/drivers/dri/i965/Makefile.am |1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/src/mesa/drivers/dri/i965/Makefile.am 
b/src/mesa/drivers/dri/i965/Makefile.am
index dc140df..77670ef 100644
--- a/src/mesa/drivers/dri/i965/Makefile.am
+++ b/src/mesa/drivers/dri/i965/Makefile.am
@@ -62,6 +62,7 @@ TEST_LIBS = \
../common/libdri_test_stubs.la
 
 i965_dri_la_SOURCES =
+nodist_EXTRA_i965_dri_la_SOURCES = dummy2.cpp
 i965_dri_la_LIBADD = $(COMMON_LIBS)
 i965_dri_la_LDFLAGS = -module -avoid-version -shared
 

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

Mesa (9.1): mesa: Allow ETC2/EAC formats with ARB_ES3_compatibility.

2013-03-08 Thread Matt Turner 
Module: Mesa
Branch: 9.1
Commit: e3f1b34fbe360111f90d6b7f11b11c4f4b17485b
URL:
http://cgit.freedesktop.org/mesa/mesa/commit/?id=e3f1b34fbe360111f90d6b7f11b11c4f4b17485b

Author: Matt Turner matts...@gmail.com
Date:   Mon Mar  4 11:32:32 2013 -0800

mesa: Allow ETC2/EAC formats with ARB_ES3_compatibility.

Fixes piglit's oes_compressed_etc2_texture-miptree tests on Desktop GL.
Reported-by: Marek Olšák mar...@gmail.com
Reviewed-by: Anuj Phogat anuj.pho...@gmail.com

---

 src/mesa/main/glformats.c |2 +-
 src/mesa/main/teximage.c  |2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/mesa/main/glformats.c b/src/mesa/main/glformats.c
index 8728540..c1e1658 100644
--- a/src/mesa/main/glformats.c
+++ b/src/mesa/main/glformats.c
@@ -917,7 +917,7 @@ _mesa_is_compressed_format(struct gl_context *ctx, GLenum 
format)
case GL_COMPRESSED_SIGNED_RG11_EAC:
case GL_COMPRESSED_RGB8_PUNCHTHROUGH_ALPHA1_ETC2:
case GL_COMPRESSED_SRGB8_PUNCHTHROUGH_ALPHA1_ETC2:
-  return _mesa_is_gles3(ctx);
+  return _mesa_is_gles3(ctx) || ctx-Extensions.ARB_ES3_compatibility;
case GL_PALETTE4_RGB8_OES:
case GL_PALETTE4_RGBA8_OES:
case GL_PALETTE4_R5_G6_B5_OES:
diff --git a/src/mesa/main/teximage.c b/src/mesa/main/teximage.c
index 6251173..1b9525b 100644
--- a/src/mesa/main/teximage.c
+++ b/src/mesa/main/teximage.c
@@ -520,7 +520,7 @@ _mesa_base_tex_format( struct gl_context *ctx, GLint 
internalFormat )
   }
}
 
-   if (_mesa_is_gles3(ctx)) {
+   if (_mesa_is_gles3(ctx) || ctx-Extensions.ARB_ES3_compatibility) {
   switch (internalFormat) {
   case GL_COMPRESSED_RGB8_ETC2:
   case GL_COMPRESSED_SRGB8_ETC2:

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

Mesa (9.1): i965: Link i965_dri.so with C++ linker.

2013-03-08 Thread Matt Turner 
Module: Mesa
Branch: 9.1
Commit: ed29a987fd9e76ee9b80a4f9cc0079ec22b1124b
URL:
http://cgit.freedesktop.org/mesa/mesa/commit/?id=ed29a987fd9e76ee9b80a4f9cc0079ec22b1124b

Author: Frank Henigman fjhenig...@google.com
Date:   Thu Feb 28 21:21:51 2013 -0500

i965: Link i965_dri.so with C++ linker.

Force C++ linking of i965_dri.so by adding a dummy C++ source file.

Reviewed-by: Matt Turner matts...@gmail.com

---

 src/mesa/drivers/dri/i965/Makefile.am |1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/src/mesa/drivers/dri/i965/Makefile.am 
b/src/mesa/drivers/dri/i965/Makefile.am
index dc140df..77670ef 100644
--- a/src/mesa/drivers/dri/i965/Makefile.am
+++ b/src/mesa/drivers/dri/i965/Makefile.am
@@ -62,6 +62,7 @@ TEST_LIBS = \
../common/libdri_test_stubs.la
 
 i965_dri_la_SOURCES =
+nodist_EXTRA_i965_dri_la_SOURCES = dummy2.cpp
 i965_dri_la_LIBADD = $(COMMON_LIBS)
 i965_dri_la_LDFLAGS = -module -avoid-version -shared
 

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