Mesa (master): i965: Drop BRW_NEW_RASTERIZER_DISCARD flag from Broadwell SOL atom.

2014-04-07 Thread Kenneth Graunke 
Module: Mesa
Branch: master
Commit: 47682f2ca10e5d382276659638f10687ee5a19f4
URL:
http://cgit.freedesktop.org/mesa/mesa/commit/?id=47682f2ca10e5d382276659638f10687ee5a19f4

Author: Kenneth Graunke 
Date:   Mon Mar 17 20:05:13 2014 -0700

i965: Drop BRW_NEW_RASTERIZER_DISCARD flag from Broadwell SOL atom.

Nothing actually uses this---we handle rasterizer discard in the
clipper in order for statistics counters to work.

Signed-off-by: Kenneth Graunke 
Reviewed-by: Eric Anholt 

---

 src/mesa/drivers/dri/i965/gen8_sol_state.c |1 -
 1 file changed, 1 deletion(-)

diff --git a/src/mesa/drivers/dri/i965/gen8_sol_state.c 
b/src/mesa/drivers/dri/i965/gen8_sol_state.c
index 42cd2fc..ebcdaf8 100644
--- a/src/mesa/drivers/dri/i965/gen8_sol_state.c
+++ b/src/mesa/drivers/dri/i965/gen8_sol_state.c
@@ -167,7 +167,6 @@ const struct brw_tracked_state gen8_sol_state = {
.dirty = {
   .mesa  = _NEW_LIGHT,
   .brw   = BRW_NEW_BATCH |
-   BRW_NEW_RASTERIZER_DISCARD |
BRW_NEW_TRANSFORM_FEEDBACK |
BRW_NEW_VUE_MAP_GEOM_OUT,
   .cache = 0,

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

Mesa (master): i965: Use the correct program when uploading Broadwell SOL state.

2014-04-07 Thread Kenneth Graunke 
Module: Mesa
Branch: master
Commit: f68353c57c3847ab17b7e32ee98c313a14972d9b
URL:
http://cgit.freedesktop.org/mesa/mesa/commit/?id=f68353c57c3847ab17b7e32ee98c313a14972d9b

Author: Kenneth Graunke 
Date:   Mon Mar 17 20:03:43 2014 -0700

i965: Use the correct program when uploading Broadwell SOL state.

This is the equivalent of commit 43e77215b13b2f86e461cd8a62b542f.

Signed-off-by: Kenneth Graunke 
Reviewed-by: Eric Anholt 

---

 src/mesa/drivers/dri/i965/gen8_sol_state.c |8 ++--
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/src/mesa/drivers/dri/i965/gen8_sol_state.c 
b/src/mesa/drivers/dri/i965/gen8_sol_state.c
index 35aa766..42cd2fc 100644
--- a/src/mesa/drivers/dri/i965/gen8_sol_state.c
+++ b/src/mesa/drivers/dri/i965/gen8_sol_state.c
@@ -101,14 +101,11 @@ gen8_upload_3dstate_streamout(struct brw_context *brw, 
bool active,
 {
struct gl_context *ctx = &brw->ctx;
 
-   /* BRW_NEW_VERTEX_PROGRAM */
-   const struct gl_shader_program *vs_prog =
-  ctx->Shader.CurrentProgram[MESA_SHADER_VERTEX];
/* BRW_NEW_TRANSFORM_FEEDBACK */
-   const struct gl_transform_feedback_info *linked_xfb_info =
-  &vs_prog->LinkedTransformFeedback;
struct gl_transform_feedback_object *xfb_obj =
   ctx->TransformFeedback.CurrentObject;
+   const struct gl_transform_feedback_info *linked_xfb_info =
+  &xfb_obj->shader_program->LinkedTransformFeedback;
uint32_t dw1 = 0, dw2 = 0, dw3 = 0, dw4 = 0;
 
if (active) {
@@ -172,7 +169,6 @@ const struct brw_tracked_state gen8_sol_state = {
   .brw   = BRW_NEW_BATCH |
BRW_NEW_RASTERIZER_DISCARD |
BRW_NEW_TRANSFORM_FEEDBACK |
-   BRW_NEW_VERTEX_PROGRAM |
BRW_NEW_VUE_MAP_GEOM_OUT,
   .cache = 0,
},

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

Mesa (master): i965: Fix missing dirty bits in the gen8_sbe_state atom.

2014-04-07 Thread Kenneth Graunke 
Module: Mesa
Branch: master
Commit: ee12a03805418d2dd9616a79d87541cc3ab9e0ea
URL:
http://cgit.freedesktop.org/mesa/mesa/commit/?id=ee12a03805418d2dd9616a79d87541cc3ab9e0ea

Author: Kenneth Graunke 
Date:   Mon Mar 17 20:17:47 2014 -0700

i965: Fix missing dirty bits in the gen8_sbe_state atom.

These are clearly needed---the comments in the function are even present
for each one of them.   I originally had two separate state atoms for
3DSTATE_SBE and 3DSTATE_SBE_SWIZ.  When I combined the functions, I must
have forgotten to add the atoms for 3DSTATE_SBE_SWIZ.

Signed-off-by: Kenneth Graunke 
Reviewed-by: Eric Anholt 

---

 src/mesa/drivers/dri/i965/gen8_sf_state.c |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/mesa/drivers/dri/i965/gen8_sf_state.c 
b/src/mesa/drivers/dri/i965/gen8_sf_state.c
index 0693fee..0a69e70 100644
--- a/src/mesa/drivers/dri/i965/gen8_sf_state.c
+++ b/src/mesa/drivers/dri/i965/gen8_sf_state.c
@@ -101,11 +101,11 @@ upload_sbe(struct brw_context *brw)
 
 const struct brw_tracked_state gen8_sbe_state = {
.dirty = {
-  .mesa  = _NEW_LIGHT | _NEW_POINT,
+  .mesa  = _NEW_BUFFERS | _NEW_LIGHT | _NEW_POINT | _NEW_PROGRAM,
   .brw   = BRW_NEW_CONTEXT |
BRW_NEW_FRAGMENT_PROGRAM |
BRW_NEW_VUE_MAP_GEOM_OUT,
-  .cache = 0
+  .cache = CACHE_NEW_WM_PROG,
},
.emit = upload_sbe,
 };

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

Mesa (master): st/xa: Bind destination before setting new state

2014-04-07 Thread Thomas Hellstrom 
Module: Mesa
Branch: master
Commit: e5d2c5b89944007d69347fd419789312be573d0c
URL:
http://cgit.freedesktop.org/mesa/mesa/commit/?id=e5d2c5b89944007d69347fd419789312be573d0c

Author: Thomas Hellstrom 
Date:   Mon Apr  7 02:37:39 2014 -0700

st/xa: Bind destination before setting new state

Binding a new destination may cause the svga driver to emit draw calls
while propagating the surface. Make sure this doesn't happen in the middle
of sampler state setup where state may be incosistent.

In practice, surface propagation should never happen here and even if it did,
it wouldn't be a valid reason for the svga driver to emit partially set up
state, but to avoid future uncertainties, make sure this doesn't happen
anyway.

Found while auditing the state tracker for inconsistent sampler state /
sampler view setup.

Cc: "10.1" 
Signed-off-by: Thomas Hellstrom 
Reviewed-by: Jakob Bornecrantz 

---

 src/gallium/state_trackers/xa/xa_renderer.c |6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/gallium/state_trackers/xa/xa_renderer.c 
b/src/gallium/state_trackers/xa/xa_renderer.c
index 9ba78be..0f5044d 100644
--- a/src/gallium/state_trackers/xa/xa_renderer.c
+++ b/src/gallium/state_trackers/xa/xa_renderer.c
@@ -406,6 +406,9 @@ renderer_copy_prepare(struct xa_context *r,
   PIPE_BIND_RENDER_TARGET));
 (void)screen;
 
+renderer_bind_destination(r, dst_surface,
+ dst_surface->width, dst_surface->height);
+
 /* set misc state we care about */
 {
struct pipe_blend_state blend;
@@ -435,9 +438,6 @@ renderer_copy_prepare(struct xa_context *r,
cso_single_sampler_done(r->cso, PIPE_SHADER_FRAGMENT);
 }
 
-renderer_bind_destination(r, dst_surface,
- dst_surface->width, dst_surface->height);
-
 /* texture/sampler view */
 {
struct pipe_sampler_view templ;

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

Mesa (master): st/xa: Make sure unused samplers are set to NULL

2014-04-07 Thread Thomas Hellstrom 
Module: Mesa
Branch: master
Commit: 47f60cbb7197bd9f8bb27ca3a2b160e8a563619a
URL:
http://cgit.freedesktop.org/mesa/mesa/commit/?id=47f60cbb7197bd9f8bb27ca3a2b160e8a563619a

Author: Thomas Hellstrom 
Date:   Mon Apr  7 13:42:25 2014 -0700

st/xa: Make sure unused samplers are set to NULL

renderer_copy_prepare was setting the first sampler but never telling
the cso code how many samplers were actually used. Fix this.

Cc: "10.1" 
Signed-off-by: Thomas Hellstrom 
Reviewed-by: Brian Paul 

---

 src/gallium/state_trackers/xa/xa_renderer.c |5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/gallium/state_trackers/xa/xa_renderer.c 
b/src/gallium/state_trackers/xa/xa_renderer.c
index 0f5044d..8a122dc 100644
--- a/src/gallium/state_trackers/xa/xa_renderer.c
+++ b/src/gallium/state_trackers/xa/xa_renderer.c
@@ -425,6 +425,7 @@ renderer_copy_prepare(struct xa_context *r,
 /* sampler */
 {
struct pipe_sampler_state sampler;
+const struct pipe_sampler_state *p_sampler = &sampler;
 
memset(&sampler, 0, sizeof(sampler));
sampler.wrap_s = PIPE_TEX_WRAP_CLAMP_TO_EDGE;
@@ -434,8 +435,8 @@ renderer_copy_prepare(struct xa_context *r,
sampler.min_img_filter = PIPE_TEX_FILTER_NEAREST;
sampler.mag_img_filter = PIPE_TEX_FILTER_NEAREST;
sampler.normalized_coords = 1;
-   cso_single_sampler(r->cso, PIPE_SHADER_FRAGMENT, 0, &sampler);
-   cso_single_sampler_done(r->cso, PIPE_SHADER_FRAGMENT);
+cso_set_samplers(r->cso, PIPE_SHADER_FRAGMENT, 1, &p_sampler);
+r->num_bound_samplers = 1;
 }
 
 /* texture/sampler view */

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

Mesa (master): glapi: Fix libglapi build.

2014-04-07 Thread Eric Anholt 
Module: Mesa
Branch: master
Commit: 34f15903d6f5807b34a4c9be6d8daaedbbdd64bc
URL:
http://cgit.freedesktop.org/mesa/mesa/commit/?id=34f15903d6f5807b34a4c9be6d8daaedbbdd64bc

Author: Eric Anholt 
Date:   Mon Apr  7 14:34:49 2014 -0700

glapi: Fix libglapi build.

This line appears to have been accidentally dropped from the last commit,
and the resulting libglapi was missing symbols.

---

 src/mapi/Makefile.sources |1 +
 1 file changed, 1 insertion(+)

diff --git a/src/mapi/Makefile.sources b/src/mapi/Makefile.sources
index 9ecf698..37ca484 100644
--- a/src/mapi/Makefile.sources
+++ b/src/mapi/Makefile.sources
@@ -41,6 +41,7 @@ MAPI_FILES = \
$(MAPI_UTIL_FILES)
 
 MAPI_GLAPI_FILES = \
+   $(TOP)/src/mapi/entry.c \
$(TOP)/src/mapi/mapi_glapi.c \
$(TOP)/src/mapi/stub.c \
$(TOP)/src/mapi/stub.h \

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

Mesa (master): egl/build: Remove unused -DXF86VIDMODE.

2014-04-07 Thread Matt Turner 
Module: Mesa
Branch: master
Commit: 5ae2f28ca7039c6f8916025f29ba12c4bda38fe4
URL:
http://cgit.freedesktop.org/mesa/mesa/commit/?id=5ae2f28ca7039c6f8916025f29ba12c4bda38fe4

Author: Matt Turner 
Date:   Sun Nov 10 17:54:36 2013 -0800

egl/build: Remove unused -DXF86VIDMODE.

Acked-by: Emil Velikov 

---

 src/egl/main/Makefile.am |4 
 1 file changed, 4 deletions(-)

diff --git a/src/egl/main/Makefile.am b/src/egl/main/Makefile.am
index 68bf3a8..937372c 100644
--- a/src/egl/main/Makefile.am
+++ b/src/egl/main/Makefile.am
@@ -19,10 +19,6 @@
 # FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
 # IN THE SOFTWARE.
 
-if HAVE_XF86VIDMODE
-EXTRA_DEFINES_XF86VIDMODE = -DXF86VIDMODE
-endif
-
 AM_CFLAGS = \
-I$(top_srcdir)/include \
-I$(top_srcdir)/src/gbm/main \

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

Mesa (master): egl/build: Include headers and XML in distribution.

2014-04-07 Thread Matt Turner 
Module: Mesa
Branch: master
Commit: 50741179280c2a341b568fe38983734ea435e956
URL:
http://cgit.freedesktop.org/mesa/mesa/commit/?id=50741179280c2a341b568fe38983734ea435e956

Author: Matt Turner 
Date:   Sun Nov 10 17:52:56 2013 -0800

egl/build: Include headers and XML in distribution.

Acked-by: Emil Velikov 

---

 src/egl/drivers/dri2/Makefile.am|1 +
 src/egl/main/Makefile.am|5 -
 src/egl/wayland/wayland-drm/Makefile.am |7 ++-
 3 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/src/egl/drivers/dri2/Makefile.am b/src/egl/drivers/dri2/Makefile.am
index 0c1625a..e589056 100644
--- a/src/egl/drivers/dri2/Makefile.am
+++ b/src/egl/drivers/dri2/Makefile.am
@@ -36,6 +36,7 @@ AM_CFLAGS = \
 noinst_LTLIBRARIES = libegl_dri2.la
 
 libegl_dri2_la_SOURCES = \
+   egl_dri2.h \
egl_dri2.c
 
 libegl_dri2_la_LIBADD = \
diff --git a/src/egl/main/Makefile.am b/src/egl/main/Makefile.am
index 4b42bd6..68bf3a8 100644
--- a/src/egl/main/Makefile.am
+++ b/src/egl/main/Makefile.am
@@ -37,7 +37,9 @@ lib_LTLIBRARIES = libEGL.la
 
 libEGL_la_SOURCES = \
eglapi.c \
+   eglapi.h \
eglarray.c \
+   eglarray.h \
eglconfig.c \
eglcontext.c \
eglcurrent.c \
@@ -69,7 +71,8 @@ libEGL_la_SOURCES = \
eglscreen.h \
eglstring.h \
eglsurface.h \
-   eglsync.h
+   eglsync.h \
+   egltypedefs.h
 
 libEGL_la_LIBADD = \
$(EGL_LIB_DEPS)
diff --git a/src/egl/wayland/wayland-drm/Makefile.am 
b/src/egl/wayland/wayland-drm/Makefile.am
index 08ee497..f40ff48 100644
--- a/src/egl/wayland/wayland-drm/Makefile.am
+++ b/src/egl/wayland/wayland-drm/Makefile.am
@@ -5,9 +5,14 @@ AM_CFLAGS = -I$(top_srcdir)/src/egl/main \
$(WAYLAND_CFLAGS) 
 
 noinst_LTLIBRARIES = libwayland-drm.la
-libwayland_drm_la_SOURCES = wayland-drm.c wayland-drm-protocol.c
+libwayland_drm_la_SOURCES = \
+   wayland-drm.c \
+   wayland-drm.h \
+   wayland-drm-protocol.c
 noinst_HEADERS = wayland-drm.h
 
+EXTRA_DIST = wayland-drm.xml
+
 BUILT_SOURCES = wayland-drm-protocol.c \
wayland-drm-client-protocol.h \
wayland-drm-server-protocol.h

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

Mesa (master): egl/build: Drop two unnecessary Makefiles.

2014-04-07 Thread Matt Turner 
Module: Mesa
Branch: master
Commit: 1d4007fbd9d4c2573815603f07d8e79fe1d377fc
URL:
http://cgit.freedesktop.org/mesa/mesa/commit/?id=1d4007fbd9d4c2573815603f07d8e79fe1d377fc

Author: Matt Turner 
Date:   Sun Nov 10 17:37:54 2013 -0800

egl/build: Drop two unnecessary Makefiles.

Acked-by: Emil Velikov 

---

 configure.ac|2 --
 src/Makefile.am |6 +-
 src/egl/Makefile.am |   24 
 src/egl/drivers/Makefile.am |   26 --
 4 files changed, 5 insertions(+), 53 deletions(-)

diff --git a/configure.ac b/configure.ac
index ee5c2d1..d2732aa 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2022,8 +2022,6 @@ CXXFLAGS="$CXXFLAGS $USER_CXXFLAGS"
 dnl Substitute the config
 AC_CONFIG_FILES([Makefile
src/Makefile
-   src/egl/Makefile
-   src/egl/drivers/Makefile
src/egl/drivers/dri2/Makefile
src/egl/main/Makefile
src/egl/main/egl.pc
diff --git a/src/Makefile.am b/src/Makefile.am
index 5b2549d..75e2a73 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -33,12 +33,16 @@ if HAVE_EGL_PLATFORM_WAYLAND
 SUBDIRS += egl/wayland
 endif
 
+if HAVE_EGL_DRIVER_DRI2
+SUBDIRS += egl/drivers/dri2
+endif
+
 if HAVE_GBM
 SUBDIRS += gbm
 endif
 
 if HAVE_EGL
-SUBDIRS += egl
+SUBDIRS += egl/main
 endif
 
 if HAVE_GALLIUM
diff --git a/src/egl/Makefile.am b/src/egl/Makefile.am
deleted file mode 100644
index cff943f..000
--- a/src/egl/Makefile.am
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright © 2012 Intel Corporation
-#
-# Permission is hereby granted, free of charge, to any person obtaining a
-# copy of this software and associated documentation files (the "Software"),
-# to deal in the Software without restriction, including without limitation
-# the rights to use, copy, modify, merge, publish, distribute, sublicense,
-# and/or sell copies of the Software, and to permit persons to whom the
-# Software is furnished to do so, subject to the following conditions:
-#
-# The above copyright notice and this permission notice (including the next
-# paragraph) shall be included in all copies or substantial portions of the
-# Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
-# THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
-# IN THE SOFTWARE.
-
-SUBDIRS=
-
-SUBDIRS += drivers main
diff --git a/src/egl/drivers/Makefile.am b/src/egl/drivers/Makefile.am
deleted file mode 100644
index f0cc6d4..000
--- a/src/egl/drivers/Makefile.am
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright © 2012 Intel Corporation
-#
-# Permission is hereby granted, free of charge, to any person obtaining a
-# copy of this software and associated documentation files (the "Software"),
-# to deal in the Software without restriction, including without limitation
-# the rights to use, copy, modify, merge, publish, distribute, sublicense,
-# and/or sell copies of the Software, and to permit persons to whom the
-# Software is furnished to do so, subject to the following conditions:
-#
-# The above copyright notice and this permission notice (including the next
-# paragraph) shall be included in all copies or substantial portions of the
-# Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
-# THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
-# IN THE SOFTWARE.
-
-SUBDIRS =
-
-if HAVE_EGL_DRIVER_DRI2
-SUBDIRS += dri2
-endif

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

Mesa (master): egl/build: Sort egl sources alphabetically.

2014-04-07 Thread Matt Turner 
Module: Mesa
Branch: master
Commit: 3f64c3d591be22bb90e4058c3a3692888e235efc
URL:
http://cgit.freedesktop.org/mesa/mesa/commit/?id=3f64c3d591be22bb90e4058c3a3692888e235efc

Author: Matt Turner 
Date:   Sun Nov 10 17:57:19 2013 -0800

egl/build: Sort egl sources alphabetically.

Acked-by: Emil Velikov 

---

 src/egl/main/Makefile.am |   30 +++---
 1 file changed, 15 insertions(+), 15 deletions(-)

diff --git a/src/egl/main/Makefile.am b/src/egl/main/Makefile.am
index 937372c..2858913 100644
--- a/src/egl/main/Makefile.am
+++ b/src/egl/main/Makefile.am
@@ -36,37 +36,37 @@ libEGL_la_SOURCES = \
eglapi.h \
eglarray.c \
eglarray.h \
-   eglconfig.c \
-   eglcontext.c \
-   eglcurrent.c \
-   egldisplay.c \
-   egldriver.c \
-   eglfallbacks.c \
-   eglglobals.c \
-   eglimage.c \
-   egllog.c \
-   eglmisc.c \
-   eglmode.c \
-   eglscreen.c \
-   eglstring.c \
-   eglsurface.c \
-   eglsync.c \
eglcompiler.h \
+   eglconfig.c \
eglconfig.h \
+   eglcontext.c \
eglcontext.h \
+   eglcurrent.c \
eglcurrent.h \
egldefines.h \
+   egldisplay.c \
egldisplay.h \
+   egldriver.c \
egldriver.h \
+   eglfallbacks.c \
+   eglglobals.c \
eglglobals.h \
+   eglimage.c \
eglimage.h \
+   egllog.c \
egllog.h \
+   eglmisc.c \
eglmisc.h \
+   eglmode.c \
eglmode.h \
eglmutex.h \
+   eglscreen.c \
eglscreen.h \
+   eglstring.c \
eglstring.h \
+   eglsurface.c \
eglsurface.h \
+   eglsync.c \
eglsync.h \
egltypedefs.h
 

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

Mesa (master): glapi/gen: Ship more Python files

2014-04-07 Thread Matt Turner 
Module: Mesa
Branch: master
Commit: fbca1ab78085374b827725aea389c24a957467ed
URL:
http://cgit.freedesktop.org/mesa/mesa/commit/?id=fbca1ab78085374b827725aea389c24a957467ed

Author: Matt Turner 
Date:   Thu Feb 21 18:57:25 2013 -0800

glapi/gen: Ship more Python files

Acked-by: Emil Velikov 

---

 src/mapi/glapi/gen/Makefile.am |   17 +
 1 file changed, 17 insertions(+)

diff --git a/src/mapi/glapi/gen/Makefile.am b/src/mapi/glapi/gen/Makefile.am
index 594c5e3..6b932e7 100644
--- a/src/mapi/glapi/gen/Makefile.am
+++ b/src/mapi/glapi/gen/Makefile.am
@@ -61,6 +61,23 @@ EXTRA_DIST= \
$(MESA_GLAPI_DIR)/glapi_x86-64.S \
$(MESA_GLAPI_DIR)/glapi_sparc.S \
$(COMMON_GLX) \
+   extension_helper.py \
+   gl_apitemp.py \
+   gl_enums.py \
+   gl_genexec.py \
+   gl_gentable.py \
+   gl_offsets.py \
+   gl_procs.py \
+   gl_SPARC_asm.py \
+   gl_table.py \
+   gl_x86-64_asm.py \
+   gl_x86_asm.py \
+   glX_proto_recv.py \
+   glX_proto_send.py \
+   glX_proto_size.py \
+   glX_server_table.py \
+   mesadef.py \
+   remap_helper.py \
gl_API.dtd
 
 ##

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

Mesa (master): glapi/gen: Ship XML and Python files

2014-04-07 Thread Matt Turner 
Module: Mesa
Branch: master
Commit: b0f37a6bd218d0649d1e176badc849a6dc150f4c
URL:
http://cgit.freedesktop.org/mesa/mesa/commit/?id=b0f37a6bd218d0649d1e176badc849a6dc150f4c

Author: Matt Turner 
Date:   Thu Feb 21 18:23:18 2013 -0800

glapi/gen: Ship XML and Python files

Acked-by: Emil Velikov 

---

 src/mapi/glapi/gen/Makefile.am |4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/mapi/glapi/gen/Makefile.am b/src/mapi/glapi/gen/Makefile.am
index 82fbaa2..594c5e3 100644
--- a/src/mapi/glapi/gen/Makefile.am
+++ b/src/mapi/glapi/gen/Makefile.am
@@ -59,7 +59,9 @@ EXTRA_DIST= \
$(BUILT_SOURCES) \
$(MESA_GLAPI_DIR)/glapi_x86.S \
$(MESA_GLAPI_DIR)/glapi_x86-64.S \
-   $(MESA_GLAPI_DIR)/glapi_sparc.S
+   $(MESA_GLAPI_DIR)/glapi_sparc.S \
+   $(COMMON_GLX) \
+   gl_API.dtd
 
 ##
 

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

Mesa (master): gbm/build: Add headers to distribution.

2014-04-07 Thread Matt Turner 
Module: Mesa
Branch: master
Commit: a97611313dc020e582da491fd898b324274f5824
URL:
http://cgit.freedesktop.org/mesa/mesa/commit/?id=a97611313dc020e582da491fd898b324274f5824

Author: Matt Turner 
Date:   Sun Nov 10 18:04:08 2013 -0800

gbm/build: Add headers to distribution.

Acked-by: Emil Velikov 

---

 src/gbm/Makefile.am |   10 --
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/src/gbm/Makefile.am b/src/gbm/Makefile.am
index 48951b8..f6545ee 100644
--- a/src/gbm/Makefile.am
+++ b/src/gbm/Makefile.am
@@ -17,8 +17,13 @@ lib_LTLIBRARIES = libgbm.la
 include_HEADERS = main/gbm.h
 
 libgbm_la_SOURCES = \
+   main/backend.c \
+   main/backend.h \
+   main/common_drm.h \
main/gbm.c \
-   main/backend.c
+   main/gbm.h \
+   main/gbmint.h
+
 libgbm_la_LDFLAGS = \
-no-undefined \
-version-info 1:0 \
@@ -38,7 +43,8 @@ endif
 if HAVE_DRI
 noinst_LTLIBRARIES = libgbm_dri.la
 libgbm_dri_la_SOURCES = \
-   backends/dri/gbm_dri.c
+   backends/dri/gbm_dri.c \
+   backends/dri/gbm_driint.h
 
 libgbm_dri_la_CFLAGS = \
$(AM_CFLAGS) \

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

Mesa (master): glapi/build: Add headers to distribution.

2014-04-07 Thread Matt Turner 
Module: Mesa
Branch: master
Commit: 144bbb7b78ecac33c62c6dc28df1747a73c4eb39
URL:
http://cgit.freedesktop.org/mesa/mesa/commit/?id=144bbb7b78ecac33c62c6dc28df1747a73c4eb39

Author: Matt Turner 
Date:   Sun Nov 10 19:01:58 2013 -0800

glapi/build: Add headers to distribution.

Acked-by: Emil Velikov 

---

 src/mapi/Makefile.sources   |   24 +++-
 src/mapi/glapi/Makefile.sources |4 +++-
 2 files changed, 22 insertions(+), 6 deletions(-)

diff --git a/src/mapi/Makefile.sources b/src/mapi/Makefile.sources
index aff465a..9ecf698 100644
--- a/src/mapi/Makefile.sources
+++ b/src/mapi/Makefile.sources
@@ -15,22 +15,36 @@
 #this mode, compile MAPI_BRIDGE_FILES with MAPI_MODE_BRIDGE defined.
 
 MAPI_UTIL_FILES = \
+   $(TOP)/src/mapi/u_compiler.h \
$(TOP)/src/mapi/u_current.c \
-   $(TOP)/src/mapi/u_execmem.c
+   $(TOP)/src/mapi/u_current.h \
+   $(TOP)/src/mapi/u_execmem.c \
+   $(TOP)/src/mapi/u_execmem.h \
+   $(TOP)/src/mapi/u_macros.h \
+   $(TOP)/src/mapi/u_thread.h
 
-MAPI_FILES = \
+MAPI_BRIDGE_FILES = \
$(TOP)/src/mapi/entry.c \
+   $(TOP)/src/mapi/entry.h \
+   $(TOP)/src/mapi/entry_x86-64_tls.h \
+   $(TOP)/src/mapi/entry_x86_tls.h \
+   $(TOP)/src/mapi/entry_x86_tsd.h \
+   $(TOP)/src/mapi/mapi_tmp.h
+
+MAPI_FILES = \
$(TOP)/src/mapi/mapi.c \
+   $(TOP)/src/mapi/mapi.h \
$(TOP)/src/mapi/stub.c \
+   $(TOP)/src/mapi/stub.h \
$(TOP)/src/mapi/table.c \
+   $(TOP)/src/mapi/table.h \
$(MAPI_UTIL_FILES)
 
 MAPI_GLAPI_FILES = \
-   $(TOP)/src/mapi/entry.c \
$(TOP)/src/mapi/mapi_glapi.c \
$(TOP)/src/mapi/stub.c \
+   $(TOP)/src/mapi/stub.h \
$(TOP)/src/mapi/table.c \
+   $(TOP)/src/mapi/table.h \
$(MAPI_UTIL_FILES)
 
-MAPI_BRIDGE_FILES = \
-   $(TOP)/src/mapi/entry.c
diff --git a/src/mapi/glapi/Makefile.sources b/src/mapi/glapi/Makefile.sources
index 100e634..04fef6c 100644
--- a/src/mapi/glapi/Makefile.sources
+++ b/src/mapi/glapi/Makefile.sources
@@ -6,7 +6,9 @@ GLAPI_SOURCES = \
glapi_gentable.c \
glapi_getproc.c \
glapi_nop.c \
-   glapi.c
+   glapi.c \
+   glapi.h \
+   glapi_priv.h
 
 X86_API =  \
glapi_x86.S

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

Mesa (master): glapi/gen: Add missing XML files to API_XML

2014-04-07 Thread Matt Turner 
Module: Mesa
Branch: master
Commit: f76ac9c9a67853bcacee90304d08f1bf8e655c55
URL:
http://cgit.freedesktop.org/mesa/mesa/commit/?id=f76ac9c9a67853bcacee90304d08f1bf8e655c55

Author: Matt Turner 
Date:   Thu Feb 21 18:16:42 2013 -0800

glapi/gen: Add missing XML files to API_XML

Also (re)move XML files from COMMON to API_XML.

Acked-by: Emil Velikov 

---

 src/mapi/glapi/gen/Makefile.am |   21 ++---
 1 file changed, 10 insertions(+), 11 deletions(-)

diff --git a/src/mapi/glapi/gen/Makefile.am b/src/mapi/glapi/gen/Makefile.am
index e3ac348..82fbaa2 100644
--- a/src/mapi/glapi/gen/Makefile.am
+++ b/src/mapi/glapi/gen/Makefile.am
@@ -88,8 +88,11 @@ XORG_OUTPUTS = \
 
 API_XML = \
gl_API.xml \
+   es_EXT.xml \
+   gl_and_es_API.xml \
ARB_base_instance.xml \
ARB_blend_func_extended.xml \
+   ARB_clear_buffer_object.xml \
ARB_color_buffer_float.xml \
ARB_compute_shader.xml \
ARB_copy_buffer.xml \
@@ -105,6 +108,8 @@ API_XML = \
ARB_ES3_compatibility.xml \
ARB_framebuffer_object.xml \
ARB_geometry_shader4.xml \
+   ARB_get_program_binary.xml \
+   ARB_gpu_shader5.xml \
ARB_instanced_arrays.xml \
ARB_internalformat_query.xml \
ARB_invalidate_subdata.xml \
@@ -129,6 +134,7 @@ API_XML = \
ARB_texture_storage_multisample.xml \
ARB_texture_storage.xml \
ARB_texture_view.xml \
+   ARB_uniform_buffer_object.xml \
ARB_vertex_array_object.xml \
ARB_vertex_attrib_binding.xml \
ARB_viewport_array.xml \
@@ -137,7 +143,6 @@ API_XML = \
ARB_vertex_type_2_10_10_10_rev.xml \
APPLE_object_purgeable.xml \
APPLE_vertex_array_object.xml \
-   ARB_uniform_buffer_object.xml \
EXT_draw_buffers2.xml \
EXT_framebuffer_object.xml \
EXT_gpu_shader4.xml \
@@ -147,28 +152,22 @@ API_XML = \
EXT_texture_array.xml \
EXT_texture_integer.xml \
EXT_transform_feedback.xml \
+   KHR_debug.xml \
NV_conditional_render.xml \
NV_primitive_restart.xml \
NV_texture_barrier.xml \
NV_vdpau_interop.xml \
OES_EGL_image.xml \
+   OES_fixed_point.xml \
+   OES_single_precision.xml \
GL3x.xml \
GL4x.xml
 
-
-
 COMMON = $(API_XML) \
gl_XML.py \
glX_XML.py \
license.py \
-   typeexpr.py \
-   gl_and_es_API.xml \
-   es_EXT.xml \
-   ARB_ES2_compatibility.xml \
-   ARB_ES3_compatibility.xml \
-   ARB_get_program_binary.xml \
-   OES_fixed_point.xml \
-   OES_single_precision.xml
+   typeexpr.py
 
 COMMON_GLX = $(COMMON) glX_API.xml glX_XML.py glX_proto_common.py
 

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

Mesa (master): src/build: Add getopt to distribution.

2014-04-07 Thread Matt Turner 
Module: Mesa
Branch: master
Commit: cdc3a6bb2137c28088adcf53695e555d5f4e0bf0
URL:
http://cgit.freedesktop.org/mesa/mesa/commit/?id=cdc3a6bb2137c28088adcf53695e555d5f4e0bf0

Author: Matt Turner 
Date:   Sun Nov 10 18:06:41 2013 -0800

src/build: Add getopt to distribution.

Acked-by: Emil Velikov 

---

 src/Makefile.am |2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/Makefile.am b/src/Makefile.am
index 75e2a73..9d1580f 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -59,3 +59,5 @@ SUBDIRS +=\
gallium/tests/unit
 endif
 endif
+
+EXTRA_DIST = getopt

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

Mesa (master): i965/fs: Remove left-over 'removed' variable.

2014-04-07 Thread Matt Turner 
Module: Mesa
Branch: master
Commit: 5c770ba919723bb1c5d168717e814cca4a68e877
URL:
http://cgit.freedesktop.org/mesa/mesa/commit/?id=5c770ba919723bb1c5d168717e814cca4a68e877

Author: Matt Turner 
Date:   Thu Mar 27 11:35:49 2014 -0700

i965/fs: Remove left-over 'removed' variable.

I think this was used for coalescing out partly dead large virtual
registers, but the patch that enabled that caused regressions and didn't
make it upstream.

Reviewed-by: Eric Anholt 

---

 .../drivers/dri/i965/brw_fs_register_coalesce.cpp  |   21 
 1 file changed, 8 insertions(+), 13 deletions(-)

diff --git a/src/mesa/drivers/dri/i965/brw_fs_register_coalesce.cpp 
b/src/mesa/drivers/dri/i965/brw_fs_register_coalesce.cpp
index c71fd47..6e30d16 100644
--- a/src/mesa/drivers/dri/i965/brw_fs_register_coalesce.cpp
+++ b/src/mesa/drivers/dri/i965/brw_fs_register_coalesce.cpp
@@ -169,11 +169,8 @@ fs_visitor::register_coalesce()
   if (!can_coalesce)
  continue;
 
-  bool removed = false;
   for (int i = 0; i < src_size; i++) {
  if (mov[i]) {
-removed = true;
-
 mov[i]->opcode = BRW_OPCODE_NOP;
 mov[i]->conditional_mod = BRW_CONDITIONAL_NONE;
 mov[i]->dst = reg_undef;
@@ -206,17 +203,15 @@ fs_visitor::register_coalesce()
  }
   }
 
-  if (removed) {
- for (int i = 0; i < src_size; i++) {
-live_intervals->start[var_to[i]] =
-   MIN2(live_intervals->start[var_to[i]],
-live_intervals->start[var_from[i]]);
-live_intervals->end[var_to[i]] =
-   MAX2(live_intervals->end[var_to[i]],
-live_intervals->end[var_from[i]]);
-reg_from = -1;
- }
+  for (int i = 0; i < src_size; i++) {
+ live_intervals->start[var_to[i]] =
+MIN2(live_intervals->start[var_to[i]],
+ live_intervals->start[var_from[i]]);
+ live_intervals->end[var_to[i]] =
+MAX2(live_intervals->end[var_to[i]],
+ live_intervals->end[var_from[i]]);
   }
+  reg_from = -1;
}
 
foreach_list_safe(node, &this->instructions) {

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

Mesa (master): i965/fs: Check for interference after finding all channels.

2014-04-07 Thread Matt Turner 
Module: Mesa
Branch: master
Commit: 99437b730f53dfa5d74f601415d8e2b66b68a3fd
URL:
http://cgit.freedesktop.org/mesa/mesa/commit/?id=99437b730f53dfa5d74f601415d8e2b66b68a3fd

Author: Matt Turner 
Date:   Thu Mar 27 10:15:19 2014 -0700

i965/fs: Check for interference after finding all channels.

It's more likely that we won't find writes to all channels than one will
interfere, and calculating interference is more expensive. This change
will also help prepare for coalescing load_payload instructions'
operands.

Also update the live intervals for all channels, and not just the last
that we saw.

Reviewed-by: Eric Anholt 

---

 .../drivers/dri/i965/brw_fs_register_coalesce.cpp  |   37 ++--
 1 file changed, 26 insertions(+), 11 deletions(-)

diff --git a/src/mesa/drivers/dri/i965/brw_fs_register_coalesce.cpp 
b/src/mesa/drivers/dri/i965/brw_fs_register_coalesce.cpp
index 5c16798..c71fd47 100644
--- a/src/mesa/drivers/dri/i965/brw_fs_register_coalesce.cpp
+++ b/src/mesa/drivers/dri/i965/brw_fs_register_coalesce.cpp
@@ -122,6 +122,8 @@ fs_visitor::register_coalesce()
int reg_from = -1, reg_to = -1;
int reg_to_offset[MAX_SAMPLER_MESSAGE_SIZE];
fs_inst *mov[MAX_SAMPLER_MESSAGE_SIZE];
+   int var_to[MAX_SAMPLER_MESSAGE_SIZE];
+   int var_from[MAX_SAMPLER_MESSAGE_SIZE];
 
foreach_list(node, &this->instructions) {
   fs_inst *inst = (fs_inst *)node;
@@ -129,12 +131,6 @@ fs_visitor::register_coalesce()
   if (!is_coalesce_candidate(inst, virtual_grf_sizes))
  continue;
 
-  int var_from = live_intervals->var_from_reg(&inst->src[0]);
-  int var_to = live_intervals->var_from_reg(&inst->dst);
-
-  if (!can_coalesce_vars(live_intervals, &instructions, inst, var_to, 
var_from))
- continue;
-
   if (reg_from != inst->src[0].reg) {
  reg_from = inst->src[0].reg;
 
@@ -158,6 +154,21 @@ fs_visitor::register_coalesce()
   if (channels_remaining)
  continue;
 
+  bool can_coalesce = true;
+  for (int i = 0; i < src_size; i++) {
+ var_to[i] = live_intervals->var_from_vgrf[reg_to] + reg_to_offset[i];
+ var_from[i] = live_intervals->var_from_vgrf[reg_from] + i;
+
+ if (!can_coalesce_vars(live_intervals, &instructions, inst,
+var_to[i], var_from[i])) {
+can_coalesce = false;
+break;
+ }
+  }
+
+  if (!can_coalesce)
+ continue;
+
   bool removed = false;
   for (int i = 0; i < src_size; i++) {
  if (mov[i]) {
@@ -196,11 +207,15 @@ fs_visitor::register_coalesce()
   }
 
   if (removed) {
- live_intervals->start[var_to] = MIN2(live_intervals->start[var_to],
-  live_intervals->start[var_from]);
- live_intervals->end[var_to] = MAX2(live_intervals->end[var_to],
-live_intervals->end[var_from]);
- reg_from = -1;
+ for (int i = 0; i < src_size; i++) {
+live_intervals->start[var_to[i]] =
+   MIN2(live_intervals->start[var_to[i]],
+live_intervals->start[var_from[i]]);
+live_intervals->end[var_to[i]] =
+   MAX2(live_intervals->end[var_to[i]],
+live_intervals->end[var_from[i]]);
+reg_from = -1;
+ }
   }
}
 

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

Mesa (master): i965: initialize more device info fields for Cherryview

2014-04-07 Thread Jordan Justen 
Module: Mesa
Branch: master
Commit: 70285f607ce2a0680c3e51b3717fed6a8dd19e72
URL:
http://cgit.freedesktop.org/mesa/mesa/commit/?id=70285f607ce2a0680c3e51b3717fed6a8dd19e72

Author: Jordan Justen 
Date:   Thu Apr  3 11:30:41 2014 -0700

i965: initialize more device info fields for Cherryview

The intent in 9b6b084eb7b10d006b44e3cd22585fc3e39e0c00 was
for urb .size and .min_vs_entries fields to use the values
from the GEN8_FEATURES macro.

Signed-off-by: Jordan Justen 
Reviewed-by: Kenneth Graunke 

---

 src/mesa/drivers/dri/i965/brw_device_info.c |2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/mesa/drivers/dri/i965/brw_device_info.c 
b/src/mesa/drivers/dri/i965/brw_device_info.c
index 7625c74..bf3c62e 100644
--- a/src/mesa/drivers/dri/i965/brw_device_info.c
+++ b/src/mesa/drivers/dri/i965/brw_device_info.c
@@ -231,6 +231,8 @@ static const struct brw_device_info brw_device_info_chv = {
.max_gs_threads = 70,
.max_wm_threads = 102,
.urb = {
+  .size = 128,
+  .min_vs_entries = 64,
   .max_vs_entries = 640,
   .max_gs_entries = 256,
}

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

Mesa (master): swrast: rename texture fetch functions (pt. 2)

2014-04-07 Thread Brian Paul 
Module: Mesa
Branch: master
Commit: e4ebb24b35d14741cb8973bec0fee668f662d76c
URL:
http://cgit.freedesktop.org/mesa/mesa/commit/?id=e4ebb24b35d14741cb8973bec0fee668f662d76c

Author: Brian Paul 
Date:   Sat Apr  5 09:53:01 2014 -0600

swrast: rename texture fetch functions (pt. 2)

Rename functions to match format names.

sed commands:
s/f_al1616_rev/A16L16_UNORM/g
s/f_al1616/L16A16_UNORM/g
s/f_rgb565_rev/R5G6B5_UNORM/g
s/f_rgb565/B5G6R5_UNORM/g
s/f_argb_rev/A4R4G4B4_UNORM/g
s/f_argb/B4G4R4A4_UNORM/g
s/f_rgba5551/A1B5G5R5_UNORM/g
s/f_argb1555_rev/A1R5G5B5_UNORM/g
s/f_al88_rev/A8L8_UNORM/g
s/f_al88/L8A8_UNORM/g
s/f_gr88/R8G8_UNORM/g
s/f_rg88/G8R8_UNORM/g
s/f_al44/L4A4_UNORM/g
s/f_rgb332/B2G3R3_UNORM/g

Reviewed-by: Ian Romanick 

---

 src/mesa/swrast/s_texfetch.c |   90 +++---
 src/mesa/swrast/s_texfetch_tmp.h |   30 ++---
 2 files changed, 60 insertions(+), 60 deletions(-)

diff --git a/src/mesa/swrast/s_texfetch.c b/src/mesa/swrast/s_texfetch.c
index e041dd5..b871116 100644
--- a/src/mesa/swrast/s_texfetch.c
+++ b/src/mesa/swrast/s_texfetch.c
@@ -199,33 +199,33 @@ texfetch_funcs[] =
},
{
   MESA_FORMAT_L16A16_UNORM,
-  fetch_texel_1d_f_al1616,
-  fetch_texel_2d_f_al1616,
-  fetch_texel_3d_f_al1616
+  fetch_texel_1d_L16A16_UNORM,
+  fetch_texel_2d_L16A16_UNORM,
+  fetch_texel_3d_L16A16_UNORM
},
{
   MESA_FORMAT_A16L16_UNORM,
-  fetch_texel_1d_f_al1616_rev,
-  fetch_texel_2d_f_al1616_rev,
-  fetch_texel_3d_f_al1616_rev
+  fetch_texel_1d_A16L16_UNORM,
+  fetch_texel_2d_A16L16_UNORM,
+  fetch_texel_3d_A16L16_UNORM
},
{
   MESA_FORMAT_B5G6R5_UNORM,
-  fetch_texel_1d_f_rgb565,
-  fetch_texel_2d_f_rgb565,
-  fetch_texel_3d_f_rgb565
+  fetch_texel_1d_B5G6R5_UNORM,
+  fetch_texel_2d_B5G6R5_UNORM,
+  fetch_texel_3d_B5G6R5_UNORM
},
{
   MESA_FORMAT_R5G6B5_UNORM,
-  fetch_texel_1d_f_rgb565_rev,
-  fetch_texel_2d_f_rgb565_rev,
-  fetch_texel_3d_f_rgb565_rev
+  fetch_texel_1d_R5G6B5_UNORM,
+  fetch_texel_2d_R5G6B5_UNORM,
+  fetch_texel_3d_R5G6B5_UNORM
},
{
   MESA_FORMAT_B4G4R4A4_UNORM,
-  fetch_texel_1d_f_argb,
-  fetch_texel_2d_f_argb,
-  fetch_texel_3d_f_argb
+  fetch_texel_1d_B4G4R4A4_UNORM,
+  fetch_texel_2d_B4G4R4A4_UNORM,
+  fetch_texel_3d_B4G4R4A4_UNORM
},
{
   MESA_FORMAT_B4G4R4X4_UNORM,
@@ -235,21 +235,21 @@ texfetch_funcs[] =
},
{
   MESA_FORMAT_A4R4G4B4_UNORM,
-  fetch_texel_1d_f_argb_rev,
-  fetch_texel_2d_f_argb_rev,
-  fetch_texel_3d_f_argb_rev
+  fetch_texel_1d_A4R4G4B4_UNORM,
+  fetch_texel_2d_A4R4G4B4_UNORM,
+  fetch_texel_3d_A4R4G4B4_UNORM
},
{
   MESA_FORMAT_A1B5G5R5_UNORM,
-  fetch_texel_1d_f_rgba5551,
-  fetch_texel_2d_f_rgba5551,
-  fetch_texel_3d_f_rgba5551
+  fetch_texel_1d_A1B5G5R5_UNORM,
+  fetch_texel_2d_A1B5G5R5_UNORM,
+  fetch_texel_3d_A1B5G5R5_UNORM
},
{
   MESA_FORMAT_B5G5R5A1_UNORM,
-  fetch_texel_1d_f_argb1555,
-  fetch_texel_2d_f_argb1555,
-  fetch_texel_3d_f_argb1555
+  fetch_texel_1d_B5G5R5A1_UNORM,
+  fetch_texel_2d_B5G5R5A1_UNORM,
+  fetch_texel_3d_B5G5R5A1_UNORM
},
{
   MESA_FORMAT_B5G5R5X1_UNORM,
@@ -259,45 +259,45 @@ texfetch_funcs[] =
},
{
   MESA_FORMAT_A1R5G5B5_UNORM,
-  fetch_texel_1d_f_argb1555_rev,
-  fetch_texel_2d_f_argb1555_rev,
-  fetch_texel_3d_f_argb1555_rev
+  fetch_texel_1d_A1R5G5B5_UNORM,
+  fetch_texel_2d_A1R5G5B5_UNORM,
+  fetch_texel_3d_A1R5G5B5_UNORM
},
{
   MESA_FORMAT_L8A8_UNORM,
-  fetch_texel_1d_f_al88,
-  fetch_texel_2d_f_al88,
-  fetch_texel_3d_f_al88
+  fetch_texel_1d_L8A8_UNORM,
+  fetch_texel_2d_L8A8_UNORM,
+  fetch_texel_3d_L8A8_UNORM
},
{
   MESA_FORMAT_A8L8_UNORM,
-  fetch_texel_1d_f_al88_rev,
-  fetch_texel_2d_f_al88_rev,
-  fetch_texel_3d_f_al88_rev
+  fetch_texel_1d_A8L8_UNORM,
+  fetch_texel_2d_A8L8_UNORM,
+  fetch_texel_3d_A8L8_UNORM
},
{
   MESA_FORMAT_R8G8_UNORM,
-  fetch_texel_1d_f_gr88,
-  fetch_texel_2d_f_gr88,
-  fetch_texel_3d_f_gr88
+  fetch_texel_1d_R8G8_UNORM,
+  fetch_texel_2d_R8G8_UNORM,
+  fetch_texel_3d_R8G8_UNORM
},
{
   MESA_FORMAT_G8R8_UNORM,
-  fetch_texel_1d_f_rg88,
-  fetch_texel_2d_f_rg88,
-  fetch_texel_3d_f_rg88
+  fetch_texel_1d_G8R8_UNORM,
+  fetch_texel_2d_G8R8_UNORM,
+  fetch_texel_3d_G8R8_UNORM
},
{
   MESA_FORMAT_L4A4_UNORM,
-  fetch_texel_1d_f_al44,
-  fetch_texel_2d_f_al44,
-  fetch_texel_3d_f_al44
+  fetch_texel_1d_L4A4_UNORM,
+  fetch_texel_2d_L4A4_UNORM,
+  fetch_texel_3d_L4A4_UNORM
},
{
   MESA_FORMAT_B2G3R3_UNORM,
-  fetch_texel_1d_f_rgb332,
-  fetch_texel_2d_f_rgb332,
-  fetch_texel_3d_f

Mesa (master): mesa: rename stencil/Z functions in format_unpack.c

2014-04-07 Thread Brian Paul 
Module: Mesa
Branch: master
Commit: e0fafd191380412082bcde1197c95c65aa6d7242
URL:
http://cgit.freedesktop.org/mesa/mesa/commit/?id=e0fafd191380412082bcde1197c95c65aa6d7242

Author: Brian Paul 
Date:   Sat Apr  5 09:53:01 2014 -0600

mesa: rename stencil/Z functions in format_unpack.c

So the function names match the format names.

Reviewed-by: Ian Romanick 

---

 src/mesa/main/format_unpack.c |   80 -
 1 file changed, 40 insertions(+), 40 deletions(-)

diff --git a/src/mesa/main/format_unpack.c b/src/mesa/main/format_unpack.c
index 2ef2e31..cf96609 100644
--- a/src/mesa/main/format_unpack.c
+++ b/src/mesa/main/format_unpack.c
@@ -645,7 +645,7 @@ unpack_R10G10B10A2_UINT(const void *src, GLfloat dst[][4], 
GLuint n)
 
 
 static void
-unpack_Z24_S8(const void *src, GLfloat dst[][4], GLuint n)
+unpack_S8_UINT_Z24_UNORM(const void *src, GLfloat dst[][4], GLuint n)
 {
/* only return Z, not stencil data */
const GLuint *s = ((const GLuint *) src);
@@ -662,7 +662,7 @@ unpack_Z24_S8(const void *src, GLfloat dst[][4], GLuint n)
 }
 
 static void
-unpack_S8_Z24(const void *src, GLfloat dst[][4], GLuint n)
+unpack_Z24_UNORM_S8_UINT(const void *src, GLfloat dst[][4], GLuint n)
 {
/* only return Z, not stencil data */
const GLuint *s = ((const GLuint *) src);
@@ -679,7 +679,7 @@ unpack_S8_Z24(const void *src, GLfloat dst[][4], GLuint n)
 }
 
 static void
-unpack_Z16(const void *src, GLfloat dst[][4], GLuint n)
+unpack_Z_UNORM16(const void *src, GLfloat dst[][4], GLuint n)
 {
const GLushort *s = ((const GLushort *) src);
GLuint i;
@@ -692,19 +692,19 @@ unpack_Z16(const void *src, GLfloat dst[][4], GLuint n)
 }
 
 static void
-unpack_X8_Z24(const void *src, GLfloat dst[][4], GLuint n)
+unpack_Z24_UNORM_X8_UINT(const void *src, GLfloat dst[][4], GLuint n)
 {
-   unpack_S8_Z24(src, dst, n);
+   unpack_Z24_UNORM_S8_UINT(src, dst, n);
 }
 
 static void
-unpack_Z24_X8(const void *src, GLfloat dst[][4], GLuint n)
+unpack_X8_UINT_Z24_UNORM(const void *src, GLfloat dst[][4], GLuint n)
 {
-   unpack_Z24_S8(src, dst, n);
+   unpack_S8_UINT_Z24_UNORM(src, dst, n);
 }
 
 static void
-unpack_Z32(const void *src, GLfloat dst[][4], GLuint n)
+unpack_Z_UNORM32(const void *src, GLfloat dst[][4], GLuint n)
 {
const GLuint *s = ((const GLuint *) src);
GLuint i;
@@ -717,7 +717,7 @@ unpack_Z32(const void *src, GLfloat dst[][4], GLuint n)
 }
 
 static void
-unpack_Z32_FLOAT_X24S8(const void *src, GLfloat dst[][4], GLuint n)
+unpack_Z32_FLOAT_S8X24_UINT(const void *src, GLfloat dst[][4], GLuint n)
 {
const struct z32f_x24s8 *s = (const struct z32f_x24s8 *) src;
GLuint i;
@@ -730,7 +730,7 @@ unpack_Z32_FLOAT_X24S8(const void *src, GLfloat dst[][4], 
GLuint n)
 }
 
 static void
-unpack_Z32_FLOAT(const void *src, GLfloat dst[][4], GLuint n)
+unpack_Z_FLOAT32(const void *src, GLfloat dst[][4], GLuint n)
 {
const GLfloat *s = ((const GLfloat *) src);
GLuint i;
@@ -2391,12 +2391,12 @@ get_unpack_rgba_function(mesa_format format)
   table[MESA_FORMAT_B10G10R10A2_UNORM] = unpack_B10G10R10A2_UNORM;
   table[MESA_FORMAT_B10G10R10A2_UINT] = unpack_B10G10R10A2_UINT;
   table[MESA_FORMAT_R10G10B10A2_UINT] = unpack_R10G10B10A2_UINT;
-  table[MESA_FORMAT_S8_UINT_Z24_UNORM] = unpack_Z24_S8;
-  table[MESA_FORMAT_Z24_UNORM_S8_UINT] = unpack_S8_Z24;
-  table[MESA_FORMAT_Z_UNORM16] = unpack_Z16;
-  table[MESA_FORMAT_Z24_UNORM_X8_UINT] = unpack_X8_Z24;
-  table[MESA_FORMAT_X8_UINT_Z24_UNORM] = unpack_Z24_X8;
-  table[MESA_FORMAT_Z_UNORM32] = unpack_Z32;
+  table[MESA_FORMAT_S8_UINT_Z24_UNORM] = unpack_S8_UINT_Z24_UNORM;
+  table[MESA_FORMAT_Z24_UNORM_S8_UINT] = unpack_Z24_UNORM_S8_UINT;
+  table[MESA_FORMAT_Z_UNORM16] = unpack_Z_UNORM16;
+  table[MESA_FORMAT_Z24_UNORM_X8_UINT] = unpack_Z24_UNORM_X8_UINT;
+  table[MESA_FORMAT_X8_UINT_Z24_UNORM] = unpack_X8_UINT_Z24_UNORM;
+  table[MESA_FORMAT_Z_UNORM32] = unpack_Z_UNORM32;
   table[MESA_FORMAT_S_UINT8] = unpack_S8;
   table[MESA_FORMAT_BGR_SRGB8] = unpack_BGR_SRGB8;
   table[MESA_FORMAT_A8B8G8R8_SRGB] = unpack_A8B8G8R8_SRGB;
@@ -2533,8 +2533,8 @@ get_unpack_rgba_function(mesa_format format)
   table[MESA_FORMAT_R9G9B9E5_FLOAT] = unpack_R9G9B9E5_FLOAT;
   table[MESA_FORMAT_R11G11B10_FLOAT] = unpack_R11G11B10_FLOAT;
 
-  table[MESA_FORMAT_Z_FLOAT32] = unpack_Z32_FLOAT;
-  table[MESA_FORMAT_Z32_FLOAT_S8X24_UINT] = unpack_Z32_FLOAT_X24S8;
+  table[MESA_FORMAT_Z_FLOAT32] = unpack_Z_FLOAT32;
+  table[MESA_FORMAT_Z32_FLOAT_S8X24_UINT] = unpack_Z32_FLOAT_S8X24_UINT;
 
   table[MESA_FORMAT_B4G4R4X4_UNORM] = unpack_XRGB_UNORM;
   table[MESA_FORMAT_B5G5R5X1_UNORM] = unpack_XRGB1555_UNORM;
@@ -3935,7 +3935,7 @@ _mesa_unpack_rgba_block(mesa_format format,
 typedef void (*unpack_float_z_func)(GLuint n, const void *src, GLfloat *dst);
 
 static void
-unpack_float_z_Z24_X8(GLuint n, const void *src, GLfloat *dst)
+unpack_float_z_X8_UI

Mesa (master): swrast: rename texture fetch functions (pt. 1)

2014-04-07 Thread Brian Paul 
Module: Mesa
Branch: master
Commit: fde325838970cccbe565f7ab30d8ca3695cc997f
URL:
http://cgit.freedesktop.org/mesa/mesa/commit/?id=fde325838970cccbe565f7ab30d8ca3695cc997f

Author: Brian Paul 
Date:   Sat Apr  5 09:53:01 2014 -0600

swrast: rename texture fetch functions (pt. 1)

Rename functions to match format names.

sed commands:
s/signed_rgba_rev/R8G8B8A8_SNORM/g
s/signed_rgba/A8B8G8R8_SNORM/g
s/f_rgba_rev/R8G8B8A_UNORM/g
s/f_rgba/A8B8G8R8_UNORM/g
s/f_rgbx_rev/R8G8B8X8_UNORM/g
s/f_rgbx/X8B8G8R8_UNORM/g
s/f_argb_rev/A8R8G8B8_UNORM/g
s/f_argb/B8G8R8A8_UNORM/g
s/f_xrgb_rev/X8R8G8B8_UNORM/g
s/f_xrgb/B8G8R8X8_UNORM/g
s/signed_rgbx/X8B8G8R8_SNORM/g

Reviewed-by: Ian Romanick 

---

 src/mesa/swrast/s_texfetch.c |   66 +++---
 src/mesa/swrast/s_texfetch_tmp.h |   22 ++---
 2 files changed, 44 insertions(+), 44 deletions(-)

diff --git a/src/mesa/swrast/s_texfetch.c b/src/mesa/swrast/s_texfetch.c
index cd09827..e041dd5 100644
--- a/src/mesa/swrast/s_texfetch.c
+++ b/src/mesa/swrast/s_texfetch.c
@@ -151,51 +151,51 @@ texfetch_funcs[] =
/* Packed unorm formats */
{
   MESA_FORMAT_A8B8G8R8_UNORM,
-  fetch_texel_1d_f_rgba,
-  fetch_texel_2d_f_rgba,
-  fetch_texel_3d_f_rgba
+  fetch_texel_1d_A8B8G8R8_UNORM,
+  fetch_texel_2d_A8B8G8R8_UNORM,
+  fetch_texel_3d_A8B8G8R8_UNORM
},
{
   MESA_FORMAT_X8B8G8R8_UNORM,
-  fetch_texel_1d_f_rgbx,
-  fetch_texel_2d_f_rgbx,
-  fetch_texel_3d_f_rgbx
+  fetch_texel_1d_X8B8G8R8_UNORM,
+  fetch_texel_2d_X8B8G8R8_UNORM,
+  fetch_texel_3d_X8B8G8R8_UNORM
},
{
   MESA_FORMAT_R8G8B8A8_UNORM,
-  fetch_texel_1d_f_rgba_rev,
-  fetch_texel_2d_f_rgba_rev,
-  fetch_texel_3d_f_rgba_rev
+  fetch_texel_1d_R8G8B8A_UNORM,
+  fetch_texel_2d_R8G8B8A_UNORM,
+  fetch_texel_3d_R8G8B8A_UNORM
},
{
   MESA_FORMAT_R8G8B8X8_UNORM,
-  fetch_texel_1d_f_rgbx_rev,
-  fetch_texel_2d_f_rgbx_rev,
-  fetch_texel_3d_f_rgbx_rev
+  fetch_texel_1d_R8G8B8X8_UNORM,
+  fetch_texel_2d_R8G8B8X8_UNORM,
+  fetch_texel_3d_R8G8B8X8_UNORM
},
{
   MESA_FORMAT_B8G8R8A8_UNORM,
-  fetch_texel_1d_f_argb,
-  fetch_texel_2d_f_argb,
-  fetch_texel_3d_f_argb
+  fetch_texel_1d_B8G8R8A8_UNORM,
+  fetch_texel_2d_B8G8R8A8_UNORM,
+  fetch_texel_3d_B8G8R8A8_UNORM
},
{
   MESA_FORMAT_B8G8R8X8_UNORM,
-  fetch_texel_1d_f_xrgb,
-  fetch_texel_2d_f_xrgb,
-  fetch_texel_3d_f_xrgb
+  fetch_texel_1d_B8G8R8X8_UNORM,
+  fetch_texel_2d_B8G8R8X8_UNORM,
+  fetch_texel_3d_B8G8R8X8_UNORM
},
{
   MESA_FORMAT_A8R8G8B8_UNORM,
-  fetch_texel_1d_f_argb_rev,
-  fetch_texel_2d_f_argb_rev,
-  fetch_texel_3d_f_argb_rev
+  fetch_texel_1d_A8R8G8B8_UNORM,
+  fetch_texel_2d_A8R8G8B8_UNORM,
+  fetch_texel_3d_A8R8G8B8_UNORM
},
{
   MESA_FORMAT_X8R8G8B8_UNORM,
-  fetch_texel_1d_f_xrgb_rev,
-  fetch_texel_2d_f_xrgb_rev,
-  fetch_texel_3d_f_xrgb_rev
+  fetch_texel_1d_X8R8G8B8_UNORM,
+  fetch_texel_2d_X8R8G8B8_UNORM,
+  fetch_texel_3d_X8R8G8B8_UNORM
},
{
   MESA_FORMAT_L16A16_UNORM,
@@ -467,21 +467,21 @@ texfetch_funcs[] =
/* Packed signed/normalized formats */
{
   MESA_FORMAT_A8B8G8R8_SNORM,
-  fetch_texel_1d_signed_rgba,
-  fetch_texel_2d_signed_rgba,
-  fetch_texel_3d_signed_rgba
+  fetch_texel_1d_A8B8G8R8_SNORM,
+  fetch_texel_2d_A8B8G8R8_SNORM,
+  fetch_texel_3d_A8B8G8R8_SNORM
},
{
   MESA_FORMAT_X8B8G8R8_SNORM,
-  fetch_texel_1d_signed_rgbx,
-  fetch_texel_2d_signed_rgbx,
-  fetch_texel_3d_signed_rgbx
+  fetch_texel_1d_X8B8G8R8_SNORM,
+  fetch_texel_2d_X8B8G8R8_SNORM,
+  fetch_texel_3d_X8B8G8R8_SNORM
},
{
   MESA_FORMAT_R8G8B8A8_SNORM,
-  fetch_texel_1d_signed_rgba_rev,
-  fetch_texel_2d_signed_rgba_rev,
-  fetch_texel_3d_signed_rgba_rev
+  fetch_texel_1d_R8G8B8A8_SNORM,
+  fetch_texel_2d_R8G8B8A8_SNORM,
+  fetch_texel_3d_R8G8B8A8_SNORM
},
{
   MESA_FORMAT_R8G8B8X8_SNORM,
diff --git a/src/mesa/swrast/s_texfetch_tmp.h b/src/mesa/swrast/s_texfetch_tmp.h
index f749b49..0acbe4f 100644
--- a/src/mesa/swrast/s_texfetch_tmp.h
+++ b/src/mesa/swrast/s_texfetch_tmp.h
@@ -391,7 +391,7 @@ static void FETCH(f_rg_f16)( const struct 
swrast_texture_image *texImage,
 /* MESA_FORMAT_A8B8G8R8_UNORM 
**/
 
 /* Fetch texel from 1D, 2D or 3D rgba texture, return 4 GLfloats */
-static void FETCH(f_rgba)( const struct swrast_texture_image *texImage,
+static void FETCH(A8B8G8R8_UNORM)( const struct swrast_texture_image *texImage,
GLint i, GLint j, GLint k, GLfloat *texel )

Mesa (master): swrast: rename texture fetch functions (pt. 6)

2014-04-07 Thread Brian Paul 
Module: Mesa
Branch: master
Commit: d41fe0aec287429ab76a2d646c68c35b8d1c687c
URL:
http://cgit.freedesktop.org/mesa/mesa/commit/?id=d41fe0aec287429ab76a2d646c68c35b8d1c687c

Author: Brian Paul 
Date:   Sat Apr  5 09:53:01 2014 -0600

swrast: rename texture fetch functions (pt. 6)

sed commands:
s/rgb9_e5/R9G9B9E5_FLOAT/g
s/r11_g11_b10f/R11G11B10_FLOAT/g
s/f_alpha_f16/A_FLOAT16/g
s/f_alpha_f32/A_FLOAT32/g
s/f_luminance_f16/L_FLOAT16/g
s/f_luminance_f32/L_FLOAT32/g
s/f_luminance_alpha_f16/LA_FLOAT16/g
s/f_luminance_alpha_f32/LA_FLOAT32/g
s/f_intensity_f16/I_FLOAT16/g
s/f_intensity_f32/I_FLOAT32/g
s/f_r_f16/R_FLOAT16/g
s/f_r_f32/R_FLOAT32/g
s/f_rg_f16/RG_FLOAT16/g
s/f_rg_f32/RG_FLOAT32/g
s/f_rgb_f16/RGB_FLOAT16/g
s/f_rgb_f32/RGB_FLOAT32/g
s/f_rgba_f16/RGBA_FLOAT16/g
s/f_rgba_f32/RGBA_FLOAT32/g
s/xbgr16161616_float/RGBX_FLOAT16/g
s/xbgr32323232_float/RGBX_FLOAT32/g

Reviewed-by: Ian Romanick 

---

 src/mesa/swrast/s_texfetch.c |  126 +++---
 src/mesa/swrast/s_texfetch_tmp.h |   40 ++--
 2 files changed, 83 insertions(+), 83 deletions(-)

diff --git a/src/mesa/swrast/s_texfetch.c b/src/mesa/swrast/s_texfetch.c
index 54ef464..dec75a1 100644
--- a/src/mesa/swrast/s_texfetch.c
+++ b/src/mesa/swrast/s_texfetch.c
@@ -649,15 +649,15 @@ texfetch_funcs[] =
/* Packed float formats */
{
   MESA_FORMAT_R9G9B9E5_FLOAT,
-  fetch_texel_1d_rgb9_e5,
-  fetch_texel_2d_rgb9_e5,
-  fetch_texel_3d_rgb9_e5
+  fetch_texel_1d_R9G9B9E5_FLOAT,
+  fetch_texel_2d_R9G9B9E5_FLOAT,
+  fetch_texel_3d_R9G9B9E5_FLOAT
},
{
   MESA_FORMAT_R11G11B10_FLOAT,
-  fetch_texel_1d_r11_g11_b10f,
-  fetch_texel_2d_r11_g11_b10f,
-  fetch_texel_3d_r11_g11_b10f
+  fetch_texel_1d_R11G11B10_FLOAT,
+  fetch_texel_2d_R11G11B10_FLOAT,
+  fetch_texel_3d_R11G11B10_FLOAT
},
{
   MESA_FORMAT_Z32_FLOAT_S8X24_UINT,
@@ -669,117 +669,117 @@ texfetch_funcs[] =
/* Array float formats */
{
   MESA_FORMAT_A_FLOAT16,
-  fetch_texel_1d_f_alpha_f16,
-  fetch_texel_2d_f_alpha_f16,
-  fetch_texel_3d_f_alpha_f16
+  fetch_texel_1d_A_FLOAT16,
+  fetch_texel_2d_A_FLOAT16,
+  fetch_texel_3d_A_FLOAT16
},
{
   MESA_FORMAT_A_FLOAT32,
-  fetch_texel_1d_f_alpha_f32,
-  fetch_texel_2d_f_alpha_f32,
-  fetch_texel_3d_f_alpha_f32
+  fetch_texel_1d_A_FLOAT32,
+  fetch_texel_2d_A_FLOAT32,
+  fetch_texel_3d_A_FLOAT32
},
{
   MESA_FORMAT_L_FLOAT16,
-  fetch_texel_1d_f_luminance_f16,
-  fetch_texel_2d_f_luminance_f16,
-  fetch_texel_3d_f_luminance_f16
+  fetch_texel_1d_L_FLOAT16,
+  fetch_texel_2d_L_FLOAT16,
+  fetch_texel_3d_L_FLOAT16
},
{
   MESA_FORMAT_L_FLOAT32,
-  fetch_texel_1d_f_luminance_f32,
-  fetch_texel_2d_f_luminance_f32,
-  fetch_texel_3d_f_luminance_f32
+  fetch_texel_1d_L_FLOAT32,
+  fetch_texel_2d_L_FLOAT32,
+  fetch_texel_3d_L_FLOAT32
},
{
   MESA_FORMAT_LA_FLOAT16,
-  fetch_texel_1d_f_luminance_alpha_f16,
-  fetch_texel_2d_f_luminance_alpha_f16,
-  fetch_texel_3d_f_luminance_alpha_f16
+  fetch_texel_1d_LA_FLOAT16,
+  fetch_texel_2d_LA_FLOAT16,
+  fetch_texel_3d_LA_FLOAT16
},
{
   MESA_FORMAT_LA_FLOAT32,
-  fetch_texel_1d_f_luminance_alpha_f32,
-  fetch_texel_2d_f_luminance_alpha_f32,
-  fetch_texel_3d_f_luminance_alpha_f32
+  fetch_texel_1d_LA_FLOAT32,
+  fetch_texel_2d_LA_FLOAT32,
+  fetch_texel_3d_LA_FLOAT32
},
{
   MESA_FORMAT_I_FLOAT16,
-  fetch_texel_1d_f_intensity_f16,
-  fetch_texel_2d_f_intensity_f16,
-  fetch_texel_3d_f_intensity_f16
+  fetch_texel_1d_I_FLOAT16,
+  fetch_texel_2d_I_FLOAT16,
+  fetch_texel_3d_I_FLOAT16
},
{
   MESA_FORMAT_I_FLOAT32,
-  fetch_texel_1d_f_intensity_f32,
-  fetch_texel_2d_f_intensity_f32,
-  fetch_texel_3d_f_intensity_f32
+  fetch_texel_1d_I_FLOAT32,
+  fetch_texel_2d_I_FLOAT32,
+  fetch_texel_3d_I_FLOAT32
},
{
   MESA_FORMAT_R_FLOAT16,
-  fetch_texel_1d_f_r_f16,
-  fetch_texel_2d_f_r_f16,
-  fetch_texel_3d_f_r_f16
+  fetch_texel_1d_R_FLOAT16,
+  fetch_texel_2d_R_FLOAT16,
+  fetch_texel_3d_R_FLOAT16
},
{
   MESA_FORMAT_R_FLOAT32,
-  fetch_texel_1d_f_r_f32,
-  fetch_texel_2d_f_r_f32,
-  fetch_texel_3d_f_r_f32
+  fetch_texel_1d_R_FLOAT32,
+  fetch_texel_2d_R_FLOAT32,
+  fetch_texel_3d_R_FLOAT32
},
{
   MESA_FORMAT_RG_FLOAT16,
-  fetch_texel_1d_f_rg_f16,
-  fetch_texel_2d_f_rg_f16,
-  fetch_texel_3d_f_rg_f16
+  fetch_texel_1d_RG_FLOAT16,
+  fetch_texel_2d_RG_FLOAT16,
+  fetch_texel_3d_RG_FLOAT16
},
{
   MESA_FORMAT_RG_FLOAT32,
-  fetch_texel_1d_f_rg_f32,
-  fetch_texel_2d_f_rg_f32,
-  fetch_texel_3d_f_rg_f32
+  fetch_texel_1d_RG_FLOAT32,
+  fetch_texel_2d_RG_FLOAT32,
+  fetch_texel_3d_RG_FLOA

Mesa (master): swrast: reindent s_texfetch_temp.h, remove trailing whitespace

2014-04-07 Thread Brian Paul 
Module: Mesa
Branch: master
Commit: d3ef6f542797ff36df9cfd2f1694f8144005
URL:
http://cgit.freedesktop.org/mesa/mesa/commit/?id=d3ef6f542797ff36df9cfd2f1694f8144005

Author: Brian Paul 
Date:   Sat Apr  5 09:53:02 2014 -0600

swrast: reindent s_texfetch_temp.h, remove trailing whitespace

Reviewed-by: Ian Romanick 

---

 src/mesa/swrast/s_texfetch_tmp.h |  443 ++
 1 file changed, 261 insertions(+), 182 deletions(-)

diff --git a/src/mesa/swrast/s_texfetch_tmp.h b/src/mesa/swrast/s_texfetch_tmp.h
index 9c3033b..b1981e4 100644
--- a/src/mesa/swrast/s_texfetch_tmp.h
+++ b/src/mesa/swrast/s_texfetch_tmp.h
@@ -27,14 +27,14 @@
 /**
  * \file texfetch_tmp.h
  * Texel fetch functions template.
- * 
+ *
  * This template file is used by texfetch.c to generate texel fetch functions
- * for 1-D, 2-D and 3-D texture images. 
+ * for 1-D, 2-D and 3-D texture images.
  *
  * It should be expanded by defining \p DIM as the number texture dimensions
  * (1, 2 or 3).  According to the value of \p DIM a series of macros is defined
  * for the texel lookup in the gl_texture_image::Data.
- * 
+ *
  * \author Gareth Hughes
  * \author Brian Paul
  */
@@ -69,24 +69,27 @@
 #endif
 
 
-static void FETCH(Z_UNORM32)( const struct swrast_texture_image *texImage,
-  GLint i, GLint j, GLint k, GLfloat *texel )
+static void
+FETCH(Z_UNORM32)(const struct swrast_texture_image *texImage,
+ GLint i, GLint j, GLint k, GLfloat *texel)
 {
const GLuint *src = TEXEL_ADDR(GLuint, texImage, i, j, k, 1);
texel[0] = src[0] * (1.0F / 0x);
 }
 
 
-static void FETCH(Z_UNORM16)(const struct swrast_texture_image *texImage,
- GLint i, GLint j, GLint k, GLfloat *texel )
+static void
+FETCH(Z_UNORM16)(const struct swrast_texture_image *texImage,
+ GLint i, GLint j, GLint k, GLfloat *texel)
 {
const GLushort *src = TEXEL_ADDR(GLushort, texImage, i, j, k, 1);
texel[0] = src[0] * (1.0F / 65535.0F);
 }
 
 
-static void FETCH(RGBA_FLOAT32)( const struct swrast_texture_image *texImage,
-   GLint i, GLint j, GLint k, GLfloat *texel )
+static void
+FETCH(RGBA_FLOAT32)(const struct swrast_texture_image *texImage,
+GLint i, GLint j, GLint k, GLfloat *texel)
 {
const GLfloat *src = TEXEL_ADDR(GLfloat, texImage, i, j, k, 4);
texel[RCOMP] = src[0];
@@ -96,8 +99,9 @@ static void FETCH(RGBA_FLOAT32)( const struct 
swrast_texture_image *texImage,
 }
 
 
-static void FETCH(RGBA_FLOAT16)( const struct swrast_texture_image *texImage,
-   GLint i, GLint j, GLint k, GLfloat *texel )
+static void
+FETCH(RGBA_FLOAT16)(const struct swrast_texture_image *texImage,
+GLint i, GLint j, GLint k, GLfloat *texel)
 {
const GLhalfARB *src = TEXEL_ADDR(GLhalfARB, texImage, i, j, k, 4);
texel[RCOMP] = _mesa_half_to_float(src[0]);
@@ -107,8 +111,9 @@ static void FETCH(RGBA_FLOAT16)( const struct 
swrast_texture_image *texImage,
 }
 
 
-static void FETCH(RGB_FLOAT32)( const struct swrast_texture_image *texImage,
-  GLint i, GLint j, GLint k, GLfloat *texel )
+static void
+FETCH(RGB_FLOAT32)(const struct swrast_texture_image *texImage,
+   GLint i, GLint j, GLint k, GLfloat *texel)
 {
const GLfloat *src = TEXEL_ADDR(GLfloat, texImage, i, j, k, 3);
texel[RCOMP] = src[0];
@@ -118,8 +123,9 @@ static void FETCH(RGB_FLOAT32)( const struct 
swrast_texture_image *texImage,
 }
 
 
-static void FETCH(RGB_FLOAT16)( const struct swrast_texture_image *texImage,
-  GLint i, GLint j, GLint k, GLfloat *texel )
+static void
+FETCH(RGB_FLOAT16)(const struct swrast_texture_image *texImage,
+   GLint i, GLint j, GLint k, GLfloat *texel)
 {
const GLhalfARB *src = TEXEL_ADDR(GLhalfARB, texImage, i, j, k, 3);
texel[RCOMP] = _mesa_half_to_float(src[0]);
@@ -129,8 +135,9 @@ static void FETCH(RGB_FLOAT16)( const struct 
swrast_texture_image *texImage,
 }
 
 
-static void FETCH(A_FLOAT32)( const struct swrast_texture_image *texImage,
-  GLint i, GLint j, GLint k, GLfloat *texel )
+static void
+FETCH(A_FLOAT32)(const struct swrast_texture_image *texImage,
+ GLint i, GLint j, GLint k, GLfloat *texel)
 {
const GLfloat *src = TEXEL_ADDR(GLfloat, texImage, i, j, k, 1);
texel[RCOMP] =
@@ -140,8 +147,9 @@ static void FETCH(A_FLOAT32)( const struct 
swrast_texture_image *texImage,
 }
 
 
-static void FETCH(A_FLOAT16)( const struct swrast_texture_image *texImage,
-  GLint i, GLint j, GLint k, GLfloat *texel )
+static void
+FETCH(A_FLOAT16)(const struct swrast_texture_image *texImage,
+ GLint i, GLint j, GLint k, GLfloat *texel)
 {
const GLhalfARB *src = TEXEL_ADDR(GLhalfARB, texImage, i, j, k, 1);
texel[RCOMP] =
@@ -151,8 +159,9 @@ static void FETCH(A_FLOAT16)( co

Mesa (master): swrast: remove out of date comments in s_texfetch_tmp.h

2014-04-07 Thread Brian Paul 
Module: Mesa
Branch: master
Commit: a19d60faefa91678dd6a5e38ae7350625523f71e
URL:
http://cgit.freedesktop.org/mesa/mesa/commit/?id=a19d60faefa91678dd6a5e38ae7350625523f71e

Author: Brian Paul 
Date:   Sat Apr  5 09:53:01 2014 -0600

swrast: remove out of date comments in s_texfetch_tmp.h

The comments were out of date and redundant (the functions are
pretty much self-explanatory).

Reviewed-by: Ian Romanick 

---

 src/mesa/swrast/s_texfetch_tmp.h |  467 +-
 1 file changed, 10 insertions(+), 457 deletions(-)

diff --git a/src/mesa/swrast/s_texfetch_tmp.h b/src/mesa/swrast/s_texfetch_tmp.h
index 849f061..9c3033b 100644
--- a/src/mesa/swrast/s_texfetch_tmp.h
+++ b/src/mesa/swrast/s_texfetch_tmp.h
@@ -69,12 +69,6 @@
 #endif
 
 
-/* MESA_FORMAT_Z_UNORM32 
***/
-
-/* Fetch depth texel from 1D, 2D or 3D 32-bit depth texture,
- * returning 1 GLfloat.
- * Note: no GLchan version of this function.
- */
 static void FETCH(Z_UNORM32)( const struct swrast_texture_image *texImage,
   GLint i, GLint j, GLint k, GLfloat *texel )
 {
@@ -83,12 +77,6 @@ static void FETCH(Z_UNORM32)( const struct 
swrast_texture_image *texImage,
 }
 
 
-/* MESA_FORMAT_Z_UNORM16 
***/
-
-/* Fetch depth texel from 1D, 2D or 3D 16-bit depth texture,
- * returning 1 GLfloat.
- * Note: no GLchan version of this function.
- */
 static void FETCH(Z_UNORM16)(const struct swrast_texture_image *texImage,
  GLint i, GLint j, GLint k, GLfloat *texel )
 {
@@ -97,11 +85,6 @@ static void FETCH(Z_UNORM16)(const struct 
swrast_texture_image *texImage,
 }
 
 
-
-/* MESA_FORMAT_RGBA_F32 **/
-
-/* Fetch texel from 1D, 2D or 3D RGBA_FLOAT32 texture, returning 4 GLfloats.
- */
 static void FETCH(RGBA_FLOAT32)( const struct swrast_texture_image *texImage,
GLint i, GLint j, GLint k, GLfloat *texel )
 {
@@ -113,13 +96,6 @@ static void FETCH(RGBA_FLOAT32)( const struct 
swrast_texture_image *texImage,
 }
 
 
-
-
-/* MESA_FORMAT_RGBA_F16 **/
-
-/* Fetch texel from 1D, 2D or 3D RGBA_FLOAT16 texture,
- * returning 4 GLfloats.
- */
 static void FETCH(RGBA_FLOAT16)( const struct swrast_texture_image *texImage,
GLint i, GLint j, GLint k, GLfloat *texel )
 {
@@ -131,12 +107,6 @@ static void FETCH(RGBA_FLOAT16)( const struct 
swrast_texture_image *texImage,
 }
 
 
-
-/* MESA_FORMAT_RGB_F32 ***/
-
-/* Fetch texel from 1D, 2D or 3D RGB_FLOAT32 texture,
- * returning 4 GLfloats.
- */
 static void FETCH(RGB_FLOAT32)( const struct swrast_texture_image *texImage,
   GLint i, GLint j, GLint k, GLfloat *texel )
 {
@@ -148,13 +118,6 @@ static void FETCH(RGB_FLOAT32)( const struct 
swrast_texture_image *texImage,
 }
 
 
-
-
-/* MESA_FORMAT_RGB_F16 ***/
-
-/* Fetch texel from 1D, 2D or 3D RGB_FLOAT16 texture,
- * returning 4 GLfloats.
- */
 static void FETCH(RGB_FLOAT16)( const struct swrast_texture_image *texImage,
   GLint i, GLint j, GLint k, GLfloat *texel )
 {
@@ -166,13 +129,6 @@ static void FETCH(RGB_FLOAT16)( const struct 
swrast_texture_image *texImage,
 }
 
 
-
-
-/* MESA_FORMAT_ALPHA_F32 */
-
-/* Fetch texel from 1D, 2D or 3D ALPHA_FLOAT32 texture,
- * returning 4 GLfloats.
- */
 static void FETCH(A_FLOAT32)( const struct swrast_texture_image *texImage,
   GLint i, GLint j, GLint k, GLfloat *texel )
 {
@@ -184,13 +140,6 @@ static void FETCH(A_FLOAT32)( const struct 
swrast_texture_image *texImage,
 }
 
 
-
-
-/* MESA_FORMAT_ALPHA_F32 */
-
-/* Fetch texel from 1D, 2D or 3D ALPHA_FLOAT16 texture,
- * returning 4 GLfloats.
- */
 static void FETCH(A_FLOAT16)( const struct swrast_texture_image *texImage,
   GLint i, GLint j, GLint k, GLfloat *texel )
 {
@@ -202,13 +151,6 @@ static void FETCH(A_FLOAT16)( const struct 
swrast_texture_image *texImage,
 }
 
 
-
-
-/* MESA_FORMAT_LUMINANCE_F32 */
-
-/* Fetch texel from 1D, 2D or 3D LUMINANCE_FLOAT32 texture,
- * returning 4 GLfloats.
- */
 static void FETCH(L_FLOAT32)( const struct swrast_texture_image *texImage,
 GLint i, GLint j, GLint k, GLfloat *texel )
 {
@@ -220,13 +162,6 @@ static void FETCH(L_FLOAT32)( const struct 
swrast_texture_image *texImage,
 }
 
 
-
-
-/* MESA_FORMAT_LUMINANCE_F16 */
-
-/* Fetch texel from 1D, 2D or 3D LUMINANCE_FLOAT16 texture,
- * returning 4 GLfloats.
- */
 static void FETCH(L_FLOAT16)( const str

Mesa (master): swrast: rename texture fetch functions (pt. 3)

2014-04-07 Thread Brian Paul 
Module: Mesa
Branch: master
Commit: a401362019a21a80a104b0a0bb69d6d163f4e03d
URL:
http://cgit.freedesktop.org/mesa/mesa/commit/?id=a401362019a21a80a104b0a0bb69d6d163f4e03d

Author: Brian Paul 
Date:   Sat Apr  5 09:53:01 2014 -0600

swrast: rename texture fetch functions (pt. 3)

Rename functions to match format names.

sed commands:
s/f_rg1616_rev/G16R16_UNORM/g
s/f_rg1616/R16G16_UNORM/g
s/f_argb2101010/B10G10R10A2_UNORM/g
s/f_a8/A_UNORM8/g
s/f_a16/A_UNORM16/g
s/f_i8/I_UNORM8/g
s/f_i16/I_UNORM16/g
s/f_r8/R_UNORM8/g
s/f_r16/R_UNORM16/g
s/f_rgb888/BGR_UNORM8/g
s/f_bgr888/RGB_UNORM8/g
s/f_l8/L_UNORM8/g
s/f_l16/L_UNORM16/g
s/xbgr16161616_unorm/RGBX_UNORM16/g

Reviewed-by: Ian Romanick 

---

 src/mesa/swrast/s_texfetch.c |   84 +++---
 src/mesa/swrast/s_texfetch_tmp.h |   28 ++---
 2 files changed, 56 insertions(+), 56 deletions(-)

diff --git a/src/mesa/swrast/s_texfetch.c b/src/mesa/swrast/s_texfetch.c
index b871116..173c0f9 100644
--- a/src/mesa/swrast/s_texfetch.c
+++ b/src/mesa/swrast/s_texfetch.c
@@ -301,21 +301,21 @@ texfetch_funcs[] =
},
{
   MESA_FORMAT_R16G16_UNORM,
-  fetch_texel_1d_f_rg1616,
-  fetch_texel_2d_f_rg1616,
-  fetch_texel_3d_f_rg1616
+  fetch_texel_1d_R16G16_UNORM,
+  fetch_texel_2d_R16G16_UNORM,
+  fetch_texel_3d_R16G16_UNORM
},
{
   MESA_FORMAT_G16R16_UNORM,
-  fetch_texel_1d_f_rg1616_rev,
-  fetch_texel_2d_f_rg1616_rev,
-  fetch_texel_3d_f_rg1616_rev
+  fetch_texel_1d_G16R16_UNORM,
+  fetch_texel_2d_G16R16_UNORM,
+  fetch_texel_3d_G16R16_UNORM
},
{
   MESA_FORMAT_B10G10R10A2_UNORM,
-  fetch_texel_1d_f_argb2101010,
-  fetch_texel_2d_f_argb2101010,
-  fetch_texel_3d_f_argb2101010
+  fetch_texel_1d_B10G10R10A2_UNORM,
+  fetch_texel_2d_B10G10R10A2_UNORM,
+  fetch_texel_3d_B10G10R10A2_UNORM
},
{
   MESA_FORMAT_B10G10R10X2_UNORM,
@@ -375,63 +375,63 @@ texfetch_funcs[] =
/* Array unorm formats */
{
   MESA_FORMAT_A_UNORM8,
-  fetch_texel_1d_f_a8,
-  fetch_texel_2d_f_a8,
-  fetch_texel_3d_f_a8
+  fetch_texel_1d_A_UNORM8,
+  fetch_texel_2d_A_UNORM8,
+  fetch_texel_3d_A_UNORM8
},
{
   MESA_FORMAT_A_UNORM16,
-  fetch_texel_1d_f_a16,
-  fetch_texel_2d_f_a16,
-  fetch_texel_3d_f_a16
+  fetch_texel_1d_A_UNORM16,
+  fetch_texel_2d_A_UNORM16,
+  fetch_texel_3d_A_UNORM16
},
{
   MESA_FORMAT_L_UNORM8,
-  fetch_texel_1d_f_l8,
-  fetch_texel_2d_f_l8,
-  fetch_texel_3d_f_l8
+  fetch_texel_1d_L_UNORM8,
+  fetch_texel_2d_L_UNORM8,
+  fetch_texel_3d_L_UNORM8
},
{
   MESA_FORMAT_L_UNORM16,
-  fetch_texel_1d_f_l16,
-  fetch_texel_2d_f_l16,
-  fetch_texel_3d_f_l16
+  fetch_texel_1d_L_UNORM16,
+  fetch_texel_2d_L_UNORM16,
+  fetch_texel_3d_L_UNORM16
},
{
   MESA_FORMAT_I_UNORM8,
-  fetch_texel_1d_f_i8,
-  fetch_texel_2d_f_i8,
-  fetch_texel_3d_f_i8
+  fetch_texel_1d_I_UNORM8,
+  fetch_texel_2d_I_UNORM8,
+  fetch_texel_3d_I_UNORM8
},
{
   MESA_FORMAT_I_UNORM16,
-  fetch_texel_1d_f_i16,
-  fetch_texel_2d_f_i16,
-  fetch_texel_3d_f_i16
+  fetch_texel_1d_I_UNORM16,
+  fetch_texel_2d_I_UNORM16,
+  fetch_texel_3d_I_UNORM16
},
{
   MESA_FORMAT_R_UNORM8,
-  fetch_texel_1d_f_r8,
-  fetch_texel_2d_f_r8,
-  fetch_texel_3d_f_r8
+  fetch_texel_1d_R_UNORM8,
+  fetch_texel_2d_R_UNORM8,
+  fetch_texel_3d_R_UNORM8
},
{
   MESA_FORMAT_R_UNORM16,
-  fetch_texel_1d_f_r16,
-  fetch_texel_2d_f_r16,
-  fetch_texel_3d_f_r16
+  fetch_texel_1d_R_UNORM16,
+  fetch_texel_2d_R_UNORM16,
+  fetch_texel_3d_R_UNORM16
},
{
   MESA_FORMAT_BGR_UNORM8,
-  fetch_texel_1d_f_rgb888,
-  fetch_texel_2d_f_rgb888,
-  fetch_texel_3d_f_rgb888
+  fetch_texel_1d_BGR_UNORM8,
+  fetch_texel_2d_BGR_UNORM8,
+  fetch_texel_3d_BGR_UNORM8
},
{
   MESA_FORMAT_RGB_UNORM8,
-  fetch_texel_1d_f_bgr888,
-  fetch_texel_2d_f_bgr888,
-  fetch_texel_3d_f_bgr888
+  fetch_texel_1d_RGB_UNORM8,
+  fetch_texel_2d_RGB_UNORM8,
+  fetch_texel_3d_RGB_UNORM8
},
{
   MESA_FORMAT_RGBA_UNORM16,
@@ -441,9 +441,9 @@ texfetch_funcs[] =
},
{
   MESA_FORMAT_RGBX_UNORM16,
-  fetch_texel_1d_xbgr16161616_unorm,
-  fetch_texel_2d_xbgr16161616_unorm,
-  fetch_texel_3d_xbgr16161616_unorm
+  fetch_texel_1d_RGBX_UNORM16,
+  fetch_texel_2d_RGBX_UNORM16,
+  fetch_texel_3d_RGBX_UNORM16
},
{
   MESA_FORMAT_Z_UNORM16,
diff --git a/src/mesa/swrast/s_texfetch_tmp.h b/src/mesa/swrast/s_texfetch_tmp.h
index 55b82bf..547951f 100644
--- a/src/mesa/swrast/s_texfetch_tmp.h
+++ b/src/mesa/swrast/s_texfetch_tmp.h
@@ -521,7 +521,7 @@ static void FETCH(X8R8G8B8_UNORM)( const struct 
swrast_texture_image *texImage,
 /* MESA_FORMAT_BGR_UNORM

Mesa (master): swrast: rename texture fetch functions (pt. 7)

2014-04-07 Thread Brian Paul 
Module: Mesa
Branch: master
Commit: 56db16fb5b26103512b4573ea7dda893d0b89d13
URL:
http://cgit.freedesktop.org/mesa/mesa/commit/?id=56db16fb5b26103512b4573ea7dda893d0b89d13

Author: Brian Paul 
Date:   Sat Apr  5 09:53:01 2014 -0600

swrast: rename texture fetch functions (pt. 7)

sed commands:
s/f_z24_s8/S8_UINT_Z24_UNORM/g
s/f_s8_z24/Z24_UNORM_S8_UINT/g
s/f_z16/Z_UNORM16/g
s/f_z32/Z_UNORM32/g
s/z32f_x24s8/Z32_FLOAT_S8X24_UINT/g
s/f_ycbcr_rev/YCBCR_REV/g
s/f_ycbcr/YCBCR/g
s/dudv8/DUDV8/g

Reviewed-by: Ian Romanick 

---

 src/mesa/swrast/s_texfetch.c |   60 +++---
 src/mesa/swrast/s_texfetch_tmp.h |   16 +-
 2 files changed, 38 insertions(+), 38 deletions(-)

diff --git a/src/mesa/swrast/s_texfetch.c b/src/mesa/swrast/s_texfetch.c
index dec75a1..3ad4a5b 100644
--- a/src/mesa/swrast/s_texfetch.c
+++ b/src/mesa/swrast/s_texfetch.c
@@ -331,45 +331,45 @@ texfetch_funcs[] =
},
{
   MESA_FORMAT_S8_UINT_Z24_UNORM,
-  fetch_texel_1d_f_z24_s8,
-  fetch_texel_2d_f_z24_s8,
-  fetch_texel_3d_f_z24_s8
+  fetch_texel_1d_S8_UINT_Z24_UNORM,
+  fetch_texel_2d_S8_UINT_Z24_UNORM,
+  fetch_texel_3d_S8_UINT_Z24_UNORM
},
{
   MESA_FORMAT_X8_UINT_Z24_UNORM,
-  fetch_texel_1d_f_z24_s8,
-  fetch_texel_2d_f_z24_s8,
-  fetch_texel_3d_f_z24_s8
+  fetch_texel_1d_S8_UINT_Z24_UNORM,
+  fetch_texel_2d_S8_UINT_Z24_UNORM,
+  fetch_texel_3d_S8_UINT_Z24_UNORM
},
{
   MESA_FORMAT_Z24_UNORM_S8_UINT,
-  fetch_texel_1d_f_s8_z24,
-  fetch_texel_2d_f_s8_z24,
-  fetch_texel_3d_f_s8_z24
+  fetch_texel_1d_Z24_UNORM_S8_UINT,
+  fetch_texel_2d_Z24_UNORM_S8_UINT,
+  fetch_texel_3d_Z24_UNORM_S8_UINT
},
{
   MESA_FORMAT_Z24_UNORM_X8_UINT,
-  fetch_texel_1d_f_s8_z24,
-  fetch_texel_2d_f_s8_z24,
-  fetch_texel_3d_f_s8_z24
+  fetch_texel_1d_Z24_UNORM_S8_UINT,
+  fetch_texel_2d_Z24_UNORM_S8_UINT,
+  fetch_texel_3d_Z24_UNORM_S8_UINT
},
{
   MESA_FORMAT_YCBCR,
-  fetch_texel_1d_f_ycbcr,
-  fetch_texel_2d_f_ycbcr,
-  fetch_texel_3d_f_ycbcr
+  fetch_texel_1d_YCBCR,
+  fetch_texel_2d_YCBCR,
+  fetch_texel_3d_YCBCR
},
{
   MESA_FORMAT_YCBCR_REV,
-  fetch_texel_1d_f_ycbcr_rev,
-  fetch_texel_2d_f_ycbcr_rev,
-  fetch_texel_3d_f_ycbcr_rev
+  fetch_texel_1d_YCBCR_REV,
+  fetch_texel_2d_YCBCR_REV,
+  fetch_texel_3d_YCBCR_REV
},
{
   MESA_FORMAT_DUDV8,
-  fetch_texel_1d_dudv8,
-  fetch_texel_2d_dudv8,
-  fetch_texel_3d_dudv8
+  fetch_texel_1d_DUDV8,
+  fetch_texel_2d_DUDV8,
+  fetch_texel_3d_DUDV8
},
 
/* Array unorm formats */
@@ -447,15 +447,15 @@ texfetch_funcs[] =
},
{
   MESA_FORMAT_Z_UNORM16,
-  fetch_texel_1d_f_z16,
-  fetch_texel_2d_f_z16,
-  fetch_texel_3d_f_z16
+  fetch_texel_1d_Z_UNORM16,
+  fetch_texel_2d_Z_UNORM16,
+  fetch_texel_3d_Z_UNORM16
},
{
   MESA_FORMAT_Z_UNORM32,
-  fetch_texel_1d_f_z32,
-  fetch_texel_2d_f_z32,
-  fetch_texel_3d_f_z32
+  fetch_texel_1d_Z_UNORM32,
+  fetch_texel_2d_Z_UNORM32,
+  fetch_texel_3d_Z_UNORM32
},
{
   MESA_FORMAT_S_UINT8,
@@ -661,9 +661,9 @@ texfetch_funcs[] =
},
{
   MESA_FORMAT_Z32_FLOAT_S8X24_UINT,
-  fetch_texel_1d_z32f_x24s8,
-  fetch_texel_2d_z32f_x24s8,
-  fetch_texel_3d_z32f_x24s8
+  fetch_texel_1d_Z32_FLOAT_S8X24_UINT,
+  fetch_texel_2d_Z32_FLOAT_S8X24_UINT,
+  fetch_texel_3d_Z32_FLOAT_S8X24_UINT
},
 
/* Array float formats */
diff --git a/src/mesa/swrast/s_texfetch_tmp.h b/src/mesa/swrast/s_texfetch_tmp.h
index af2815e..849f061 100644
--- a/src/mesa/swrast/s_texfetch_tmp.h
+++ b/src/mesa/swrast/s_texfetch_tmp.h
@@ -75,7 +75,7 @@
  * returning 1 GLfloat.
  * Note: no GLchan version of this function.
  */
-static void FETCH(f_z32)( const struct swrast_texture_image *texImage,
+static void FETCH(Z_UNORM32)( const struct swrast_texture_image *texImage,
   GLint i, GLint j, GLint k, GLfloat *texel )
 {
const GLuint *src = TEXEL_ADDR(GLuint, texImage, i, j, k, 1);
@@ -89,7 +89,7 @@ static void FETCH(f_z32)( const struct swrast_texture_image 
*texImage,
  * returning 1 GLfloat.
  * Note: no GLchan version of this function.
  */
-static void FETCH(f_z16)(const struct swrast_texture_image *texImage,
+static void FETCH(Z_UNORM16)(const struct swrast_texture_image *texImage,
  GLint i, GLint j, GLint k, GLfloat *texel )
 {
const GLushort *src = TEXEL_ADDR(GLushort, texImage, i, j, k, 1);
@@ -1166,7 +1166,7 @@ FETCH(rgba_uint32)(const struct swrast_texture_image 
*texImage,
 
 /* this format by definition produces 0,0,0,1 as rgba values,
however we'll return the dudv values as rg and fix up elsewhere */
-static void FETCH(dudv8)(const struct swrast_texture_image *texImage,
+static void FETCH(DUDV8)(const struct swrast_texture_image *texI

Mesa (master): swrast: rename texture fetch functions (pt. 5)

2014-04-07 Thread Brian Paul 
Module: Mesa
Branch: master
Commit: 9eb45114fdffd2c0644b080ce70a6bca6a087ed7
URL:
http://cgit.freedesktop.org/mesa/mesa/commit/?id=9eb45114fdffd2c0644b080ce70a6bca6a087ed7

Author: Brian Paul 
Date:   Sat Apr  5 09:53:01 2014 -0600

swrast: rename texture fetch functions (pt. 5)

sed commands:
s/srgba8/A8B8G8R8_SRGB/g
s/sargb8/B8G8R8A8_SRGB/g
s/sabgr8/R8G8B8A8_SRGB/g
s/sxbgr8/R8G8B8X8_SRGB/g
s/sla8/L8A8_SRGB/g
s/sl8/L_SRGB8/g
s/srgb8/BGR_SRGB8/g

Reviewed-by: Ian Romanick 

---

 src/mesa/swrast/s_texfetch.c |   42 +++---
 src/mesa/swrast/s_texfetch_tmp.h |   28 -
 2 files changed, 35 insertions(+), 35 deletions(-)

diff --git a/src/mesa/swrast/s_texfetch.c b/src/mesa/swrast/s_texfetch.c
index cecdd5e..54ef464 100644
--- a/src/mesa/swrast/s_texfetch.c
+++ b/src/mesa/swrast/s_texfetch.c
@@ -597,15 +597,15 @@ texfetch_funcs[] =
/* Packed sRGB formats */
{
   MESA_FORMAT_A8B8G8R8_SRGB,
-  fetch_texel_1d_srgba8,
-  fetch_texel_2d_srgba8,
-  fetch_texel_3d_srgba8
+  fetch_texel_1d_A8B8G8R8_SRGB,
+  fetch_texel_2d_A8B8G8R8_SRGB,
+  fetch_texel_3d_A8B8G8R8_SRGB
},
{
   MESA_FORMAT_B8G8R8A8_SRGB,
-  fetch_texel_1d_sargb8,
-  fetch_texel_2d_sargb8,
-  fetch_texel_3d_sargb8
+  fetch_texel_1d_B8G8R8A8_SRGB,
+  fetch_texel_2d_B8G8R8A8_SRGB,
+  fetch_texel_3d_B8G8R8A8_SRGB
},
{
   MESA_FORMAT_B8G8R8X8_SRGB,
@@ -615,35 +615,35 @@ texfetch_funcs[] =
},
{
   MESA_FORMAT_R8G8B8A8_SRGB,
-  fetch_texel_1d_sabgr8,
-  fetch_texel_2d_sabgr8,
-  fetch_texel_3d_sabgr8
+  fetch_texel_1d_R8G8B8A8_SRGB,
+  fetch_texel_2d_R8G8B8A8_SRGB,
+  fetch_texel_3d_R8G8B8A8_SRGB
},
{
   MESA_FORMAT_R8G8B8X8_SRGB,
-  fetch_texel_1d_sxbgr8,
-  fetch_texel_2d_sxbgr8,
-  fetch_texel_3d_sxbgr8
+  fetch_texel_1d_R8G8B8X8_SRGB,
+  fetch_texel_2d_R8G8B8X8_SRGB,
+  fetch_texel_3d_R8G8B8X8_SRGB
},
{
   MESA_FORMAT_L8A8_SRGB,
-  fetch_texel_1d_sla8,
-  fetch_texel_2d_sla8,
-  fetch_texel_3d_sla8
+  fetch_texel_1d_L8A8_SRGB,
+  fetch_texel_2d_L8A8_SRGB,
+  fetch_texel_3d_L8A8_SRGB
},
 
/* Array sRGB formats */
{
   MESA_FORMAT_L_SRGB8,
-  fetch_texel_1d_sl8,
-  fetch_texel_2d_sl8,
-  fetch_texel_3d_sl8
+  fetch_texel_1d_L_SRGB8,
+  fetch_texel_2d_L_SRGB8,
+  fetch_texel_3d_L_SRGB8
},
{
   MESA_FORMAT_BGR_SRGB8,
-  fetch_texel_1d_srgb8,
-  fetch_texel_2d_srgb8,
-  fetch_texel_3d_srgb8
+  fetch_texel_1d_BGR_SRGB8,
+  fetch_texel_2d_BGR_SRGB8,
+  fetch_texel_3d_BGR_SRGB8
},
 
/* Packed float formats */
diff --git a/src/mesa/swrast/s_texfetch_tmp.h b/src/mesa/swrast/s_texfetch_tmp.h
index ea0d56a..651b5cb 100644
--- a/src/mesa/swrast/s_texfetch_tmp.h
+++ b/src/mesa/swrast/s_texfetch_tmp.h
@@ -975,9 +975,9 @@ static void FETCH(I_UNORM16)( const struct 
swrast_texture_image *texImage,
 
 
 
-/* Fetch texel from 1D, 2D or 3D srgb8 texture, return 4 GLfloats */
+/* Fetch texel from 1D, 2D or 3D BGR_SRGB8 texture, return 4 GLfloats */
 /* Note: component order is same as for MESA_FORMAT_BGR_UNORM8 */
-static void FETCH(srgb8)(const struct swrast_texture_image *texImage,
+static void FETCH(BGR_SRGB8)(const struct swrast_texture_image *texImage,
  GLint i, GLint j, GLint k, GLfloat *texel )
 {
const GLubyte *src = TEXEL_ADDR(GLubyte, texImage, i, j, k, 3);
@@ -989,8 +989,8 @@ static void FETCH(srgb8)(const struct swrast_texture_image 
*texImage,
 
 
 
-/* Fetch texel from 1D, 2D or 3D srgba8 texture, return 4 GLfloats */
-static void FETCH(srgba8)(const struct swrast_texture_image *texImage,
+/* Fetch texel from 1D, 2D or 3D A8B8G8R8_SRGB texture, return 4 GLfloats */
+static void FETCH(A8B8G8R8_SRGB)(const struct swrast_texture_image *texImage,
   GLint i, GLint j, GLint k, GLfloat *texel )
 {
const GLuint s = *TEXEL_ADDR(GLuint, texImage, i, j, k, 1);
@@ -1002,8 +1002,8 @@ static void FETCH(srgba8)(const struct 
swrast_texture_image *texImage,
 
 
 
-/* Fetch texel from 1D, 2D or 3D sargb8 texture, return 4 GLfloats */
-static void FETCH(sargb8)(const struct swrast_texture_image *texImage,
+/* Fetch texel from 1D, 2D or 3D B8G8R8A8_SRGB texture, return 4 GLfloats */
+static void FETCH(B8G8R8A8_SRGB)(const struct swrast_texture_image *texImage,
   GLint i, GLint j, GLint k, GLfloat *texel )
 {
const GLuint s = *TEXEL_ADDR(GLuint, texImage, i, j, k, 1);
@@ -1015,8 +1015,8 @@ static void FETCH(sargb8)(const struct 
swrast_texture_image *texImage,
 
 
 
-/* Fetch texel from 1D, 2D or 3D sabgr8 texture, return 4 GLfloats */
-static void FETCH(sabgr8)(const struct swrast_texture_image *texImage,
+/* Fetch texel from 1D, 2D or 3D R8G8B8A8_SRGB texture, return 4 GLfloats */
+static void FETCH(R8G8B8A8_SRGB)(const struct swrast_texture_image *texImage,

Mesa (master): swrast: rename texture fetch functions (pt. 4)

2014-04-07 Thread Brian Paul 
Module: Mesa
Branch: master
Commit: faa8a8e8b2e71367ed747cf18697b3733b84557b
URL:
http://cgit.freedesktop.org/mesa/mesa/commit/?id=faa8a8e8b2e71367ed747cf18697b3733b84557b

Author: Brian Paul 
Date:   Sat Apr  5 09:53:01 2014 -0600

swrast: rename texture fetch functions (pt. 4)

sed commands:
s/signed_rg1616/R16G16_SNORM/g
s/signed_rg88_rev/R8G8_SNORM/g
s/signed_al88/L8A8_SNORM/g
s/signed_a8/A_SNORM8/g
s/signed_a16/A_SNORM16/g
s/signed_l8/L_SNORM8/g
s/signed_l16/L_SNORM16/g
s/signed_i8/I_SNORM8/g
s/signed_i16/I_SNORM16/g
s/signed_r8/R_SNORM8/g
s/signed_r16/R_SNORM16/g
s/signed_al1616/LA_SNORM16/g
s/signed_rgb_16/RGB_SNORM16/g
s/signed_rgba_16/RGBA_SNORM16/g

Reviewed-by: Ian Romanick 

---

 src/mesa/swrast/s_texfetch.c |   84 +++---
 src/mesa/swrast/s_texfetch_tmp.h |   28 ++---
 2 files changed, 56 insertions(+), 56 deletions(-)

diff --git a/src/mesa/swrast/s_texfetch.c b/src/mesa/swrast/s_texfetch.c
index 173c0f9..cecdd5e 100644
--- a/src/mesa/swrast/s_texfetch.c
+++ b/src/mesa/swrast/s_texfetch.c
@@ -491,9 +491,9 @@ texfetch_funcs[] =
},
{
   MESA_FORMAT_R16G16_SNORM,
-  fetch_texel_1d_signed_rg1616,
-  fetch_texel_2d_signed_rg1616,
-  fetch_texel_3d_signed_rg1616
+  fetch_texel_1d_R16G16_SNORM,
+  fetch_texel_2d_R16G16_SNORM,
+  fetch_texel_3d_R16G16_SNORM
},
{
   MESA_FORMAT_G16R16_SNORM,
@@ -503,9 +503,9 @@ texfetch_funcs[] =
},
{
   MESA_FORMAT_R8G8_SNORM,
-  fetch_texel_1d_signed_rg88_rev,
-  fetch_texel_2d_signed_rg88_rev,
-  fetch_texel_3d_signed_rg88_rev
+  fetch_texel_1d_R8G8_SNORM,
+  fetch_texel_2d_R8G8_SNORM,
+  fetch_texel_3d_R8G8_SNORM
},
{
   MESA_FORMAT_G8R8_SNORM,
@@ -515,77 +515,77 @@ texfetch_funcs[] =
},
{
   MESA_FORMAT_L8A8_SNORM,
-  fetch_texel_1d_signed_al88,
-  fetch_texel_2d_signed_al88,
-  fetch_texel_3d_signed_al88
+  fetch_texel_1d_L8A8_SNORM,
+  fetch_texel_2d_L8A8_SNORM,
+  fetch_texel_3d_L8A8_SNORM
},
 
/* Array signed/normalized formats */
{
   MESA_FORMAT_A_SNORM8,
-  fetch_texel_1d_signed_a8,
-  fetch_texel_2d_signed_a8,
-  fetch_texel_3d_signed_a8
+  fetch_texel_1d_A_SNORM8,
+  fetch_texel_2d_A_SNORM8,
+  fetch_texel_3d_A_SNORM8
},
{
   MESA_FORMAT_A_SNORM16,
-  fetch_texel_1d_signed_a16,
-  fetch_texel_2d_signed_a16,
-  fetch_texel_3d_signed_a16
+  fetch_texel_1d_A_SNORM16,
+  fetch_texel_2d_A_SNORM16,
+  fetch_texel_3d_A_SNORM16
},
{
   MESA_FORMAT_L_SNORM8,
-  fetch_texel_1d_signed_l8,
-  fetch_texel_2d_signed_l8,
-  fetch_texel_3d_signed_l8
+  fetch_texel_1d_L_SNORM8,
+  fetch_texel_2d_L_SNORM8,
+  fetch_texel_3d_L_SNORM8
},
{
   MESA_FORMAT_L_SNORM16,
-  fetch_texel_1d_signed_l16,
-  fetch_texel_2d_signed_l16,
-  fetch_texel_3d_signed_l16
+  fetch_texel_1d_L_SNORM16,
+  fetch_texel_2d_L_SNORM16,
+  fetch_texel_3d_L_SNORM16
},
{
   MESA_FORMAT_I_SNORM8,
-  fetch_texel_1d_signed_i8,
-  fetch_texel_2d_signed_i8,
-  fetch_texel_3d_signed_i8
+  fetch_texel_1d_I_SNORM8,
+  fetch_texel_2d_I_SNORM8,
+  fetch_texel_3d_I_SNORM8
},
{
   MESA_FORMAT_I_SNORM16,
-  fetch_texel_1d_signed_i16,
-  fetch_texel_2d_signed_i16,
-  fetch_texel_3d_signed_i16
+  fetch_texel_1d_I_SNORM16,
+  fetch_texel_2d_I_SNORM16,
+  fetch_texel_3d_I_SNORM16
},
{
   MESA_FORMAT_R_SNORM8,
-  fetch_texel_1d_signed_r8,
-  fetch_texel_2d_signed_r8,
-  fetch_texel_3d_signed_r8
+  fetch_texel_1d_R_SNORM8,
+  fetch_texel_2d_R_SNORM8,
+  fetch_texel_3d_R_SNORM8
},
{
   MESA_FORMAT_R_SNORM16,
-  fetch_texel_1d_signed_r16,
-  fetch_texel_2d_signed_r16,
-  fetch_texel_3d_signed_r16
+  fetch_texel_1d_R_SNORM16,
+  fetch_texel_2d_R_SNORM16,
+  fetch_texel_3d_R_SNORM16
},
{
   MESA_FORMAT_LA_SNORM16,
-  fetch_texel_1d_signed_al1616,
-  fetch_texel_2d_signed_al1616,
-  fetch_texel_3d_signed_al1616
+  fetch_texel_1d_LA_SNORM16,
+  fetch_texel_2d_LA_SNORM16,
+  fetch_texel_3d_LA_SNORM16
},
{
   MESA_FORMAT_RGB_SNORM16,
-  fetch_texel_1d_signed_rgb_16,
-  fetch_texel_2d_signed_rgb_16,
-  fetch_texel_3d_signed_rgb_16
+  fetch_texel_1d_RGB_SNORM16,
+  fetch_texel_2d_RGB_SNORM16,
+  fetch_texel_3d_RGB_SNORM16
},
{
   MESA_FORMAT_RGBA_SNORM16,
-  fetch_texel_1d_signed_rgba_16,
-  fetch_texel_2d_signed_rgba_16,
-  fetch_texel_3d_signed_rgba_16
+  fetch_texel_1d_RGBA_SNORM16,
+  fetch_texel_2d_RGBA_SNORM16,
+  fetch_texel_3d_RGBA_SNORM16
},
{
   MESA_FORMAT_RGBX_SNORM16,
diff --git a/src/mesa/swrast/s_texfetch_tmp.h b/src/mesa/swrast/s_texfetch_tmp.h
index 547951f..ea0d56a 100644
--- a/src/mesa/swrast/s_texfetch_tmp.h
+++ b/src/mesa/swrast/s

Mesa (master): nouveau: fix firmware check on nvd7/nvd9

2014-04-07 Thread Ilia Mirkin 
Module: Mesa
Branch: master
Commit: 89c5b56be6c242d1489cf5c06b04c8b7a668d6f9
URL:
http://cgit.freedesktop.org/mesa/mesa/commit/?id=89c5b56be6c242d1489cf5c06b04c8b7a668d6f9

Author: Ilia Mirkin 
Date:   Mon Apr  7 08:42:59 2014 -0400

nouveau: fix firmware check on nvd7/nvd9

The kernel driver expects the class to be based on chipset generation
rather than VP generation. Make sure to pass 90b1 for NVDX chipsets
instead of 95b1.

Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=77102
Fixes: 40dd777b33073
Signed-off-by: Ilia Mirkin 
Cc: "10.1 10.0" 
Reviewed-by: Maarten Lankhorst 

---

 src/gallium/drivers/nouveau/nouveau_vp3_video.c |6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/gallium/drivers/nouveau/nouveau_vp3_video.c 
b/src/gallium/drivers/nouveau/nouveau_vp3_video.c
index 11cf729..f3a64b2 100644
--- a/src/gallium/drivers/nouveau/nouveau_vp3_video.c
+++ b/src/gallium/drivers/nouveau/nouveau_vp3_video.c
@@ -371,10 +371,10 @@ firmware_present(struct pipe_screen *pscreen, enum 
pipe_video_profile profile)
   int size, oclass;
   if (chipset < 0xc0)
  oclass = 0x85b1;
-  else if (vp5)
- oclass = 0x95b1;
-  else
+  else if (chipset < 0xe0)
  oclass = 0x90b1;
+  else
+ oclass = 0x95b1;
 
   if (chipset < 0xc0) {
  data = &nv04_data;

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

Mesa (master): winsys/svga: Update the vmwgfx_drm.h header to latest version from kernel

2014-04-07 Thread Thomas Hellstrom 
Module: Mesa
Branch: master
Commit: 0887b499e95b0103fa01614cbc9988f0b15c75d6
URL:
http://cgit.freedesktop.org/mesa/mesa/commit/?id=0887b499e95b0103fa01614cbc9988f0b15c75d6

Author: Thomas Hellstrom 
Date:   Sun Apr  6 23:33:19 2014 -0700

winsys/svga: Update the vmwgfx_drm.h header to latest version from kernel

Cc: "10.1" 
Signed-off-by: Thomas Hellstrom 

---

 src/gallium/winsys/svga/drm/vmwgfx_drm.h |   13 -
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/src/gallium/winsys/svga/drm/vmwgfx_drm.h 
b/src/gallium/winsys/svga/drm/vmwgfx_drm.h
index e42b3f5..73ad205 100644
--- a/src/gallium/winsys/svga/drm/vmwgfx_drm.h
+++ b/src/gallium/winsys/svga/drm/vmwgfx_drm.h
@@ -87,6 +87,16 @@
 #define DRM_VMW_PARAM_MAX_SURF_MEMORY  7
 #define DRM_VMW_PARAM_3D_CAPS_SIZE 8
 #define DRM_VMW_PARAM_MAX_MOB_MEMORY   9
+#define DRM_VMW_PARAM_MAX_MOB_SIZE 10
+
+/**
+ * enum drm_vmw_handle_type - handle type for ref ioctls
+ *
+ */
+enum drm_vmw_handle_type {
+   DRM_VMW_HANDLE_LEGACY = 0,
+   DRM_VMW_HANDLE_PRIME = 1
+};
 
 /**
  * struct drm_vmw_getparam_arg
@@ -176,6 +186,7 @@ struct drm_vmw_surface_create_req {
  * struct drm_wmv_surface_arg
  *
  * @sid: Surface id of created surface or surface to destroy or reference.
+ * @handle_type: Handle type for DRM_VMW_REF_SURFACE Ioctl.
  *
  * Output data from the DRM_VMW_CREATE_SURFACE Ioctl.
  * Input argument to the DRM_VMW_UNREF_SURFACE Ioctl.
@@ -184,7 +195,7 @@ struct drm_vmw_surface_create_req {
 
 struct drm_vmw_surface_arg {
int32_t sid;
-   uint32_t pad64;
+   enum drm_vmw_handle_type handle_type;
 };
 
 /**

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

Mesa (master): winsys/svga: Fix prime surface references also for guest-backed surfaces

2014-04-07 Thread Thomas Hellstrom 
Module: Mesa
Branch: master
Commit: 2f6fcd65f2401695427bcbf1f2bd428d466ecda0
URL:
http://cgit.freedesktop.org/mesa/mesa/commit/?id=2f6fcd65f2401695427bcbf1f2bd428d466ecda0

Author: Thomas Hellstrom 
Date:   Mon Apr  7 00:56:42 2014 -0700

winsys/svga: Fix prime surface references also for guest-backed surfaces

Implement guest-backed surface sharing using prime fds. Previously only
legacy surfaces could use this functionality. Also use the vmwgfx 2.6
single-ioctl prime fd reference if available.

Cc: "10.1" 
Signed-off-by: Thomas Hellstrom 

---

 src/gallium/winsys/svga/drm/vmw_screen.h   |4 +-
 src/gallium/winsys/svga/drm/vmw_screen_dri.c   |7 ++-
 src/gallium/winsys/svga/drm/vmw_screen_ioctl.c |   76 +++-
 3 files changed, 81 insertions(+), 6 deletions(-)

diff --git a/src/gallium/winsys/svga/drm/vmw_screen.h 
b/src/gallium/winsys/svga/drm/vmw_screen.h
index b68bf43..1a39039 100644
--- a/src/gallium/winsys/svga/drm/vmw_screen.h
+++ b/src/gallium/winsys/svga/drm/vmw_screen.h
@@ -74,6 +74,7 @@ struct vmw_winsys_screen
   struct vmw_cap_3d *cap_3d;
   uint64_t max_mob_memory;
   uint64_t max_surface_memory;
+  boolean have_drm_2_6;
} ioctl;
 
struct {
@@ -138,10 +139,11 @@ vmw_ioctl_gb_surface_create(struct vmw_winsys_screen *vws,
 
 int
 vmw_ioctl_gb_surface_ref(struct vmw_winsys_screen *vws,
- uint32_t handle,
+ const struct winsys_handle *whandle,
  SVGA3dSurfaceFlags *flags,
  SVGA3dSurfaceFormat *format,
  uint32_t *numMipLevels,
+ uint32_t *handle,
  struct vmw_region **p_region);
 
 void
diff --git a/src/gallium/winsys/svga/drm/vmw_screen_dri.c 
b/src/gallium/winsys/svga/drm/vmw_screen_dri.c
index 0f5a955..79a1b3e 100644
--- a/src/gallium/winsys/svga/drm/vmw_screen_dri.c
+++ b/src/gallium/winsys/svga/drm/vmw_screen_dri.c
@@ -183,10 +183,11 @@ vmw_drm_gb_surface_from_handle(struct svga_winsys_screen 
*sws,
 struct vmw_buffer_desc desc;
 struct pb_manager *provider = vws->pools.gmr;
 struct pb_buffer *pb_buf;
+uint32_t handle;
 int ret;
 
-ret = vmw_ioctl_gb_surface_ref(vws, whandle->handle, &flags, format,
-   &mip_levels, &desc.region);
+ret = vmw_ioctl_gb_surface_ref(vws, whandle, &flags, format,
+   &mip_levels, &handle, &desc.region);
 
 if (ret) {
fprintf(stderr, "Failed referencing shared surface. SID %d.\n"
@@ -209,7 +210,7 @@ vmw_drm_gb_surface_from_handle(struct svga_winsys_screen 
*sws,
 pipe_reference_init(&vsrf->refcnt, 1);
 p_atomic_set(&vsrf->validated, 0);
 vsrf->screen = vws;
-vsrf->sid = whandle->handle;
+vsrf->sid = handle;
 vsrf->size = vmw_region_size(desc.region);
 
 /*
diff --git a/src/gallium/winsys/svga/drm/vmw_screen_ioctl.c 
b/src/gallium/winsys/svga/drm/vmw_screen_ioctl.c
index 2866a29..9c0abe9 100644
--- a/src/gallium/winsys/svga/drm/vmw_screen_ioctl.c
+++ b/src/gallium/winsys/svga/drm/vmw_screen_ioctl.c
@@ -37,6 +37,7 @@
 #include "util/u_memory.h"
 #include "util/u_math.h"
 #include "svgadump/svga_dump.h"
+#include "state_tracker/drm_driver.h"
 #include "vmw_screen.h"
 #include "vmw_context.h"
 #include "vmw_fence.h"
@@ -251,6 +252,63 @@ out_fail_create:
 }
 
 /**
+ * vmw_ioctl_surface_req - Fill in a struct surface_req
+ *
+ * @vws: Winsys screen
+ * @whandle: Surface handle
+ * @req: The struct surface req to fill in
+ * @needs_unref: This call takes a kernel surface reference that needs to
+ * be unreferenced.
+ *
+ * Returns 0 on success, negative error type otherwise.
+ * Fills in the surface_req structure according to handle type and kernel
+ * capabilities.
+ */
+static int
+vmw_ioctl_surface_req(const struct vmw_winsys_screen *vws,
+  const struct winsys_handle *whandle,
+  struct drm_vmw_surface_arg *req,
+  boolean *needs_unref)
+{
+   int ret;
+
+   switch(whandle->type) {
+   case DRM_API_HANDLE_TYPE_SHARED:
+   case DRM_API_HANDLE_TYPE_KMS:
+  *needs_unref = FALSE;
+  req->handle_type = DRM_VMW_HANDLE_LEGACY;
+  req->sid = whandle->handle;
+  break;
+   case DRM_API_HANDLE_TYPE_FD:
+  if (!vws->ioctl.have_drm_2_6) {
+ uint32_t handle;
+
+ ret = drmPrimeFDToHandle(vws->ioctl.drm_fd, whandle->handle, &handle);
+ if (ret) {
+vmw_error("Failed to get handle from prime fd %d.\n",
+  (int) whandle->handle);
+return -EINVAL;
+ }
+
+ *needs_unref = TRUE;
+ req->handle_type = DRM_VMW_HANDLE_LEGACY;
+ req->sid = handle;
+  } else {
+ *needs_unref = FALSE;
+ req->handle_type = DRM_VMW_HANDLE_PRIME;
+ req->sid = whandle->handle;
+  }
+  break;
+   default:
+  vmw_error("Attempt to import unsupported h