diff options
| author | Jonathan Gray <jsg@cvs.openbsd.org> | 2015-11-22 02:46:43 +0000 |
|---|---|---|
| committer | Jonathan Gray <jsg@cvs.openbsd.org> | 2015-11-22 02:46:43 +0000 |
| commit | 98de1de8ddad1d22b4447d94745e4de28a6a8e99 (patch) | |
| tree | 54c237339a149068283cea45f3dbf821edb57cd4 /lib | |
| parent | 4aae075c7789b61a4979f9841cf562a7bb2e6318 (diff) | |
import Mesa 11.0.6
Diffstat (limited to 'lib')
53 files changed, 160 insertions, 866 deletions
diff --git a/lib/mesa/install-gallium-links.mk b/lib/mesa/install-gallium-links.mk index fc2f75db5..f45f1b42b 100644 --- a/lib/mesa/install-gallium-links.mk +++ b/lib/mesa/install-gallium-links.mk @@ -3,18 +3,18 @@ if BUILD_SHARED if HAVE_COMPAT_SYMLINKS -all-local : .install-gallium-links +all-local : .libs/install-gallium-links -.install-gallium-links : $(dri_LTLIBRARIES) $(egl_LTLIBRARIES) $(lib_LTLIBRARIES) +.libs/install-gallium-links : $(dri_LTLIBRARIES) $(egl_LTLIBRARIES) $(lib_LTLIBRARIES) $(AM_V_GEN)$(MKDIR_P) $(top_builddir)/$(LIB_DIR); \ link_dir=$(top_builddir)/$(LIB_DIR)/gallium; \ if test x$(egl_LTLIBRARIES) != x; then \ link_dir=$(top_builddir)/$(LIB_DIR)/egl; \ fi; \ $(MKDIR_P) $$link_dir; \ - file_list="$(dri_LTLIBRARIES:%.la=.libs/%.so)"; \ - file_list="$$file_list$(egl_LTLIBRARIES:%.la=.libs/%.$(LIB_EXT)*)"; \ - file_list="$$file_list$(lib_LTLIBRARIES:%.la=.libs/%.$(LIB_EXT)*)"; \ + file_list=$(dri_LTLIBRARIES:%.la=.libs/%.so); \ + file_list+=$(egl_LTLIBRARIES:%.la=.libs/%.$(LIB_EXT)*); \ + file_list+=$(lib_LTLIBRARIES:%.la=.libs/%.$(LIB_EXT)*); \ for f in $$file_list; do \ if test -h .libs/$$f; then \ cp -d $$f $$link_dir; \ @@ -23,15 +23,4 @@ all-local : .install-gallium-links fi; \ done && touch $@ endif - -clean-local: - for f in $(notdir $(dri_LTLIBRARIES:%.la=.libs/%.$(LIB_EXT)*)) \ - $(notdir $(egl_LTLIBRARIES:%.la=.libs/%.$(LIB_EXT)*)) \ - $(notdir $(lib_LTLIBRARIES:%.la=.libs/%.$(LIB_EXT)*)); do \ - echo $$f; \ - $(RM) $(top_builddir)/$(LIB_DIR)/gallium/$$f; \ - done; - rmdir $(top_builddir)/$(LIB_DIR)/gallium || true - $(RM) .install-gallium-links - endif diff --git a/lib/mesa/m4/ax_check_python_mako_module.m4 b/lib/mesa/m4/ax_check_python_mako_module.m4 index d6484e722..7d9bb511c 100644 --- a/lib/mesa/m4/ax_check_python_mako_module.m4 +++ b/lib/mesa/m4/ax_check_python_mako_module.m4 @@ -45,14 +45,13 @@ AC_DEFUN([AX_CHECK_PYTHON_MAKO_MODULE], try: import sys import mako - import distutils.version except ImportError as err: sys.exit(err) else: - ver_req = distutils.version.LooseVersion('$1') - ver_act = distutils.version.LooseVersion(mako.__version__) + ver_req = map(int, '$1'.split('.')) + ver_act = map(int, mako.__version__.split('.')) sys.exit(int(ver_req > ver_act)) - " | $PYTHON - + " | $PYTHON2 - if test $? -ne 0 ; then AC_MSG_RESULT(no) diff --git a/lib/mesa/m4/ax_gcc_func_attribute.m4 b/lib/mesa/m4/ax_gcc_func_attribute.m4 index 2e67ea292..4e0ecbb56 100644 --- a/lib/mesa/m4/ax_gcc_func_attribute.m4 +++ b/lib/mesa/m4/ax_gcc_func_attribute.m4 @@ -53,7 +53,6 @@ # optimize # packed # pure -# returns_nonnull # unused # used # visibility @@ -77,9 +76,6 @@ #serial 2 -# mattst88: -# Added support for returns_nonnull attribute - AC_DEFUN([AX_GCC_FUNC_ATTRIBUTE], [ AS_VAR_PUSHDEF([ac_var], [ax_cv_have_func_attribute_$1]) @@ -179,9 +175,6 @@ AC_DEFUN([AX_GCC_FUNC_ATTRIBUTE], [ [pure], [ int foo( void ) __attribute__(($1)); ], - [returns_nonnull], [ - int *foo( void ) __attribute__(($1)); - ], [unused], [ int foo( void ) __attribute__(($1)); ], diff --git a/lib/mesa/src/egl/wayland/wayland-drm/Makefile.am b/lib/mesa/src/egl/wayland/wayland-drm/Makefile.am index 40174c6ac..f40ff4841 100644 --- a/lib/mesa/src/egl/wayland/wayland-drm/Makefile.am +++ b/lib/mesa/src/egl/wayland/wayland-drm/Makefile.am @@ -1,37 +1,28 @@ -AM_CFLAGS = -I$(top_srcdir)/include \ +AM_CFLAGS = -I$(top_srcdir)/src/egl/main \ + -I$(top_srcdir)/include \ $(DEFINES) \ $(VISIBILITY_CFLAGS) \ - $(WAYLAND_SERVER_CFLAGS) - -if HAVE_PLATFORM_WAYLAND -wayland-drm.lo: wayland-drm-client-protocol.h wayland-drm-server-protocol.h -endif + $(WAYLAND_CFLAGS) noinst_LTLIBRARIES = libwayland-drm.la - -nodist_libwayland_drm_la_SOURCES = \ - wayland-drm-protocol.c \ - wayland-drm-client-protocol.h \ - wayland-drm-server-protocol.h - libwayland_drm_la_SOURCES = \ wayland-drm.c \ - wayland-drm.h - + wayland-drm.h \ + wayland-drm-protocol.c noinst_HEADERS = wayland-drm.h -EXTRA_DIST = wayland-drm.xml meson.build +EXTRA_DIST = wayland-drm.xml -CLEANFILES = \ - wayland-drm-protocol.c \ - wayland-drm-client-protocol.h \ - wayland-drm-server-protocol.h +BUILT_SOURCES = wayland-drm-protocol.c \ + wayland-drm-client-protocol.h \ + wayland-drm-server-protocol.h +CLEANFILES = $(BUILT_SOURCES) %-protocol.c : %.xml - $(AM_V_GEN)$(WAYLAND_SCANNER) $(SCANNER_ARG) $< $@ + $(AM_V_GEN)$(WAYLAND_SCANNER) code < $< > $@ %-server-protocol.h : %.xml - $(AM_V_GEN)$(WAYLAND_SCANNER) server-header $< $@ + $(AM_V_GEN)$(WAYLAND_SCANNER) server-header < $< > $@ %-client-protocol.h : %.xml - $(AM_V_GEN)$(WAYLAND_SCANNER) client-header $< $@ + $(AM_V_GEN)$(WAYLAND_SCANNER) client-header < $< > $@ diff --git a/lib/mesa/src/gallium/auxiliary/indices/u_unfilled_gen.c b/lib/mesa/src/gallium/auxiliary/indices/u_unfilled_gen.c index 2ecad9e05..3f7f78e87 100644 --- a/lib/mesa/src/gallium/auxiliary/indices/u_unfilled_gen.c +++ b/lib/mesa/src/gallium/auxiliary/indices/u_unfilled_gen.c @@ -165,40 +165,6 @@ static void generate_polygon_ushort( (out+j)[1] = (ushort)((i+1)%(out_nr/2)); } } -static void generate_trisadj_ushort( - unsigned start, - unsigned out_nr, - void *_out ) -{ - ushort *out = (ushort*)_out; - unsigned i, j; - (void)j; - for (i = start, j = 0; j < out_nr; j+=6, i+=6) { - (out+j)[0] = (ushort)(i); - (out+j)[1] = (ushort)(i+2); - (out+j+2)[0] = (ushort)(i+2); - (out+j+2)[1] = (ushort)(i+4); - (out+j+4)[0] = (ushort)(i+4); - (out+j+4)[1] = (ushort)(i); - } -} -static void generate_tristripadj_ushort( - unsigned start, - unsigned out_nr, - void *_out ) -{ - ushort *out = (ushort*)_out; - unsigned i, j; - (void)j; - for (i = start, j = 0; j < out_nr; j+=6, i+=2) { - (out+j)[0] = (ushort)(i); - (out+j)[1] = (ushort)(i+2); - (out+j+2)[0] = (ushort)(i+2); - (out+j+2)[1] = (ushort)(i+4); - (out+j+4)[0] = (ushort)(i+4); - (out+j+4)[1] = (ushort)(i); - } -} static void generate_tris_uint( unsigned start, unsigned out_nr, @@ -301,40 +267,6 @@ static void generate_polygon_uint( (out+j)[1] = (uint)((i+1)%(out_nr/2)); } } -static void generate_trisadj_uint( - unsigned start, - unsigned out_nr, - void *_out ) -{ - uint *out = (uint*)_out; - unsigned i, j; - (void)j; - for (i = start, j = 0; j < out_nr; j+=6, i+=6) { - (out+j)[0] = (uint)(i); - (out+j)[1] = (uint)(i+2); - (out+j+2)[0] = (uint)(i+2); - (out+j+2)[1] = (uint)(i+4); - (out+j+4)[0] = (uint)(i+4); - (out+j+4)[1] = (uint)(i); - } -} -static void generate_tristripadj_uint( - unsigned start, - unsigned out_nr, - void *_out ) -{ - uint *out = (uint*)_out; - unsigned i, j; - (void)j; - for (i = start, j = 0; j < out_nr; j+=6, i+=2) { - (out+j)[0] = (uint)(i); - (out+j)[1] = (uint)(i+2); - (out+j+2)[0] = (uint)(i+2); - (out+j+2)[1] = (uint)(i+4); - (out+j+4)[0] = (uint)(i+4); - (out+j+4)[1] = (uint)(i); - } -} static void translate_tris_ubyte2ushort( const void * _in, unsigned start, @@ -461,48 +393,6 @@ static void translate_polygon_ubyte2ushort( (out+j)[1] = (ushort)in[(i+1)%(out_nr/2)]; } } -static void translate_trisadj_ubyte2ushort( - const void * _in, - unsigned start, - unsigned in_nr, - unsigned out_nr, - unsigned restart_index, - void *_out ) -{ - const ubyte*in = (const ubyte*)_in; - ushort *out = (ushort*)_out; - unsigned i, j; - (void)j; - for (i = start, j = 0; j < out_nr; j+=6, i+=6) { - (out+j)[0] = (ushort)in[i]; - (out+j)[1] = (ushort)in[i+2]; - (out+j+2)[0] = (ushort)in[i+2]; - (out+j+2)[1] = (ushort)in[i+4]; - (out+j+4)[0] = (ushort)in[i+4]; - (out+j+4)[1] = (ushort)in[i]; - } -} -static void translate_tristripadj_ubyte2ushort( - const void * _in, - unsigned start, - unsigned in_nr, - unsigned out_nr, - unsigned restart_index, - void *_out ) -{ - const ubyte*in = (const ubyte*)_in; - ushort *out = (ushort*)_out; - unsigned i, j; - (void)j; - for (i = start, j = 0; j < out_nr; j+=6, i+=2) { - (out+j)[0] = (ushort)in[i]; - (out+j)[1] = (ushort)in[i+2]; - (out+j+2)[0] = (ushort)in[i+2]; - (out+j+2)[1] = (ushort)in[i+4]; - (out+j+4)[0] = (ushort)in[i+4]; - (out+j+4)[1] = (ushort)in[i]; - } -} static void translate_tris_ubyte2uint( const void * _in, unsigned start, @@ -629,48 +519,6 @@ static void translate_polygon_ubyte2uint( (out+j)[1] = (uint)in[(i+1)%(out_nr/2)]; } } -static void translate_trisadj_ubyte2uint( - const void * _in, - unsigned start, - unsigned in_nr, - unsigned out_nr, - unsigned restart_index, - void *_out ) -{ - const ubyte*in = (const ubyte*)_in; - uint *out = (uint*)_out; - unsigned i, j; - (void)j; - for (i = start, j = 0; j < out_nr; j+=6, i+=6) { - (out+j)[0] = (uint)in[i]; - (out+j)[1] = (uint)in[i+2]; - (out+j+2)[0] = (uint)in[i+2]; - (out+j+2)[1] = (uint)in[i+4]; - (out+j+4)[0] = (uint)in[i+4]; - (out+j+4)[1] = (uint)in[i]; - } -} -static void translate_tristripadj_ubyte2uint( - const void * _in, - unsigned start, - unsigned in_nr, - unsigned out_nr, - unsigned restart_index, - void *_out ) -{ - const ubyte*in = (const ubyte*)_in; - uint *out = (uint*)_out; - unsigned i, j; - (void)j; - for (i = start, j = 0; j < out_nr; j+=6, i+=2) { - (out+j)[0] = (uint)in[i]; - (out+j)[1] = (uint)in[i+2]; - (out+j+2)[0] = (uint)in[i+2]; - (out+j+2)[1] = (uint)in[i+4]; - (out+j+4)[0] = (uint)in[i+4]; - (out+j+4)[1] = (uint)in[i]; - } -} static void translate_tris_ushort2ushort( const void * _in, unsigned start, @@ -797,48 +645,6 @@ static void translate_polygon_ushort2ushort( (out+j)[1] = (ushort)in[(i+1)%(out_nr/2)]; } } -static void translate_trisadj_ushort2ushort( - const void * _in, - unsigned start, - unsigned in_nr, - unsigned out_nr, - unsigned restart_index, - void *_out ) -{ - const ushort*in = (const ushort*)_in; - ushort *out = (ushort*)_out; - unsigned i, j; - (void)j; - for (i = start, j = 0; j < out_nr; j+=6, i+=6) { - (out+j)[0] = (ushort)in[i]; - (out+j)[1] = (ushort)in[i+2]; - (out+j+2)[0] = (ushort)in[i+2]; - (out+j+2)[1] = (ushort)in[i+4]; - (out+j+4)[0] = (ushort)in[i+4]; - (out+j+4)[1] = (ushort)in[i]; - } -} -static void translate_tristripadj_ushort2ushort( - const void * _in, - unsigned start, - unsigned in_nr, - unsigned out_nr, - unsigned restart_index, - void *_out ) -{ - const ushort*in = (const ushort*)_in; - ushort *out = (ushort*)_out; - unsigned i, j; - (void)j; - for (i = start, j = 0; j < out_nr; j+=6, i+=2) { - (out+j)[0] = (ushort)in[i]; - (out+j)[1] = (ushort)in[i+2]; - (out+j+2)[0] = (ushort)in[i+2]; - (out+j+2)[1] = (ushort)in[i+4]; - (out+j+4)[0] = (ushort)in[i+4]; - (out+j+4)[1] = (ushort)in[i]; - } -} static void translate_tris_ushort2uint( const void * _in, unsigned start, @@ -965,48 +771,6 @@ static void translate_polygon_ushort2uint( (out+j)[1] = (uint)in[(i+1)%(out_nr/2)]; } } -static void translate_trisadj_ushort2uint( - const void * _in, - unsigned start, - unsigned in_nr, - unsigned out_nr, - unsigned restart_index, - void *_out ) -{ - const ushort*in = (const ushort*)_in; - uint *out = (uint*)_out; - unsigned i, j; - (void)j; - for (i = start, j = 0; j < out_nr; j+=6, i+=6) { - (out+j)[0] = (uint)in[i]; - (out+j)[1] = (uint)in[i+2]; - (out+j+2)[0] = (uint)in[i+2]; - (out+j+2)[1] = (uint)in[i+4]; - (out+j+4)[0] = (uint)in[i+4]; - (out+j+4)[1] = (uint)in[i]; - } -} -static void translate_tristripadj_ushort2uint( - const void * _in, - unsigned start, - unsigned in_nr, - unsigned out_nr, - unsigned restart_index, - void *_out ) -{ - const ushort*in = (const ushort*)_in; - uint *out = (uint*)_out; - unsigned i, j; - (void)j; - for (i = start, j = 0; j < out_nr; j+=6, i+=2) { - (out+j)[0] = (uint)in[i]; - (out+j)[1] = (uint)in[i+2]; - (out+j+2)[0] = (uint)in[i+2]; - (out+j+2)[1] = (uint)in[i+4]; - (out+j+4)[0] = (uint)in[i+4]; - (out+j+4)[1] = (uint)in[i]; - } -} static void translate_tris_uint2ushort( const void * _in, unsigned start, @@ -1133,48 +897,6 @@ static void translate_polygon_uint2ushort( (out+j)[1] = (ushort)in[(i+1)%(out_nr/2)]; } } -static void translate_trisadj_uint2ushort( - const void * _in, - unsigned start, - unsigned in_nr, - unsigned out_nr, - unsigned restart_index, - void *_out ) -{ - const uint*in = (const uint*)_in; - ushort *out = (ushort*)_out; - unsigned i, j; - (void)j; - for (i = start, j = 0; j < out_nr; j+=6, i+=6) { - (out+j)[0] = (ushort)in[i]; - (out+j)[1] = (ushort)in[i+2]; - (out+j+2)[0] = (ushort)in[i+2]; - (out+j+2)[1] = (ushort)in[i+4]; - (out+j+4)[0] = (ushort)in[i+4]; - (out+j+4)[1] = (ushort)in[i]; - } -} -static void translate_tristripadj_uint2ushort( - const void * _in, - unsigned start, - unsigned in_nr, - unsigned out_nr, - unsigned restart_index, - void *_out ) -{ - const uint*in = (const uint*)_in; - ushort *out = (ushort*)_out; - unsigned i, j; - (void)j; - for (i = start, j = 0; j < out_nr; j+=6, i+=2) { - (out+j)[0] = (ushort)in[i]; - (out+j)[1] = (ushort)in[i+2]; - (out+j+2)[0] = (ushort)in[i+2]; - (out+j+2)[1] = (ushort)in[i+4]; - (out+j+4)[0] = (ushort)in[i+4]; - (out+j+4)[1] = (ushort)in[i]; - } -} static void translate_tris_uint2uint( const void * _in, unsigned start, @@ -1301,48 +1023,6 @@ static void translate_polygon_uint2uint( (out+j)[1] = (uint)in[(i+1)%(out_nr/2)]; } } -static void translate_trisadj_uint2uint( - const void * _in, - unsigned start, - unsigned in_nr, - unsigned out_nr, - unsigned restart_index, - void *_out ) -{ - const uint*in = (const uint*)_in; - uint *out = (uint*)_out; - unsigned i, j; - (void)j; - for (i = start, j = 0; j < out_nr; j+=6, i+=6) { - (out+j)[0] = (uint)in[i]; - (out+j)[1] = (uint)in[i+2]; - (out+j+2)[0] = (uint)in[i+2]; - (out+j+2)[1] = (uint)in[i+4]; - (out+j+4)[0] = (uint)in[i+4]; - (out+j+4)[1] = (uint)in[i]; - } -} -static void translate_tristripadj_uint2uint( - const void * _in, - unsigned start, - unsigned in_nr, - unsigned out_nr, - unsigned restart_index, - void *_out ) -{ - const uint*in = (const uint*)_in; - uint *out = (uint*)_out; - unsigned i, j; - (void)j; - for (i = start, j = 0; j < out_nr; j+=6, i+=2) { - (out+j)[0] = (uint)in[i]; - (out+j)[1] = (uint)in[i+2]; - (out+j+2)[0] = (uint)in[i+2]; - (out+j+2)[1] = (uint)in[i+4]; - (out+j+4)[0] = (uint)in[i+4]; - (out+j+4)[1] = (uint)in[i]; - } -} void u_unfilled_init( void ) { static int firsttime = 1; @@ -1354,63 +1034,47 @@ generate_line[OUT_USHORT][PIPE_PRIM_TRIANGLE_STRIP] = generate_tristrip_ushort; generate_line[OUT_USHORT][PIPE_PRIM_QUADS] = generate_quads_ushort; generate_line[OUT_USHORT][PIPE_PRIM_QUAD_STRIP] = generate_quadstrip_ushort; generate_line[OUT_USHORT][PIPE_PRIM_POLYGON] = generate_polygon_ushort; -generate_line[OUT_USHORT][PIPE_PRIM_TRIANGLES_ADJACENCY] = generate_trisadj_ushort; -generate_line[OUT_USHORT][PIPE_PRIM_TRIANGLE_STRIP_ADJACENCY] = generate_tristripadj_ushort; generate_line[OUT_UINT][PIPE_PRIM_TRIANGLES] = generate_tris_uint; generate_line[OUT_UINT][PIPE_PRIM_TRIANGLE_FAN] = generate_trifan_uint; generate_line[OUT_UINT][PIPE_PRIM_TRIANGLE_STRIP] = generate_tristrip_uint; generate_line[OUT_UINT][PIPE_PRIM_QUADS] = generate_quads_uint; generate_line[OUT_UINT][PIPE_PRIM_QUAD_STRIP] = generate_quadstrip_uint; generate_line[OUT_UINT][PIPE_PRIM_POLYGON] = generate_polygon_uint; -generate_line[OUT_UINT][PIPE_PRIM_TRIANGLES_ADJACENCY] = generate_trisadj_uint; -generate_line[OUT_UINT][PIPE_PRIM_TRIANGLE_STRIP_ADJACENCY] = generate_tristripadj_uint; translate_line[IN_UBYTE][OUT_USHORT][PIPE_PRIM_TRIANGLES] = translate_tris_ubyte2ushort; translate_line[IN_UBYTE][OUT_USHORT][PIPE_PRIM_TRIANGLE_FAN] = translate_trifan_ubyte2ushort; translate_line[IN_UBYTE][OUT_USHORT][PIPE_PRIM_TRIANGLE_STRIP] = translate_tristrip_ubyte2ushort; translate_line[IN_UBYTE][OUT_USHORT][PIPE_PRIM_QUADS] = translate_quads_ubyte2ushort; translate_line[IN_UBYTE][OUT_USHORT][PIPE_PRIM_QUAD_STRIP] = translate_quadstrip_ubyte2ushort; translate_line[IN_UBYTE][OUT_USHORT][PIPE_PRIM_POLYGON] = translate_polygon_ubyte2ushort; -translate_line[IN_UBYTE][OUT_USHORT][PIPE_PRIM_TRIANGLES_ADJACENCY] = translate_trisadj_ubyte2ushort; -translate_line[IN_UBYTE][OUT_USHORT][PIPE_PRIM_TRIANGLE_STRIP_ADJACENCY] = translate_tristripadj_ubyte2ushort; translate_line[IN_UBYTE][OUT_UINT][PIPE_PRIM_TRIANGLES] = translate_tris_ubyte2uint; translate_line[IN_UBYTE][OUT_UINT][PIPE_PRIM_TRIANGLE_FAN] = translate_trifan_ubyte2uint; translate_line[IN_UBYTE][OUT_UINT][PIPE_PRIM_TRIANGLE_STRIP] = translate_tristrip_ubyte2uint; translate_line[IN_UBYTE][OUT_UINT][PIPE_PRIM_QUADS] = translate_quads_ubyte2uint; translate_line[IN_UBYTE][OUT_UINT][PIPE_PRIM_QUAD_STRIP] = translate_quadstrip_ubyte2uint; translate_line[IN_UBYTE][OUT_UINT][PIPE_PRIM_POLYGON] = translate_polygon_ubyte2uint; -translate_line[IN_UBYTE][OUT_UINT][PIPE_PRIM_TRIANGLES_ADJACENCY] = translate_trisadj_ubyte2uint; -translate_line[IN_UBYTE][OUT_UINT][PIPE_PRIM_TRIANGLE_STRIP_ADJACENCY] = translate_tristripadj_ubyte2uint; translate_line[IN_USHORT][OUT_USHORT][PIPE_PRIM_TRIANGLES] = translate_tris_ushort2ushort; translate_line[IN_USHORT][OUT_USHORT][PIPE_PRIM_TRIANGLE_FAN] = translate_trifan_ushort2ushort; translate_line[IN_USHORT][OUT_USHORT][PIPE_PRIM_TRIANGLE_STRIP] = translate_tristrip_ushort2ushort; translate_line[IN_USHORT][OUT_USHORT][PIPE_PRIM_QUADS] = translate_quads_ushort2ushort; translate_line[IN_USHORT][OUT_USHORT][PIPE_PRIM_QUAD_STRIP] = translate_quadstrip_ushort2ushort; translate_line[IN_USHORT][OUT_USHORT][PIPE_PRIM_POLYGON] = translate_polygon_ushort2ushort; -translate_line[IN_USHORT][OUT_USHORT][PIPE_PRIM_TRIANGLES_ADJACENCY] = translate_trisadj_ushort2ushort; -translate_line[IN_USHORT][OUT_USHORT][PIPE_PRIM_TRIANGLE_STRIP_ADJACENCY] = translate_tristripadj_ushort2ushort; translate_line[IN_USHORT][OUT_UINT][PIPE_PRIM_TRIANGLES] = translate_tris_ushort2uint; translate_line[IN_USHORT][OUT_UINT][PIPE_PRIM_TRIANGLE_FAN] = translate_trifan_ushort2uint; translate_line[IN_USHORT][OUT_UINT][PIPE_PRIM_TRIANGLE_STRIP] = translate_tristrip_ushort2uint; translate_line[IN_USHORT][OUT_UINT][PIPE_PRIM_QUADS] = translate_quads_ushort2uint; translate_line[IN_USHORT][OUT_UINT][PIPE_PRIM_QUAD_STRIP] = translate_quadstrip_ushort2uint; translate_line[IN_USHORT][OUT_UINT][PIPE_PRIM_POLYGON] = translate_polygon_ushort2uint; -translate_line[IN_USHORT][OUT_UINT][PIPE_PRIM_TRIANGLES_ADJACENCY] = translate_trisadj_ushort2uint; -translate_line[IN_USHORT][OUT_UINT][PIPE_PRIM_TRIANGLE_STRIP_ADJACENCY] = translate_tristripadj_ushort2uint; translate_line[IN_UINT][OUT_USHORT][PIPE_PRIM_TRIANGLES] = translate_tris_uint2ushort; translate_line[IN_UINT][OUT_USHORT][PIPE_PRIM_TRIANGLE_FAN] = translate_trifan_uint2ushort; translate_line[IN_UINT][OUT_USHORT][PIPE_PRIM_TRIANGLE_STRIP] = translate_tristrip_uint2ushort; translate_line[IN_UINT][OUT_USHORT][PIPE_PRIM_QUADS] = translate_quads_uint2ushort; translate_line[IN_UINT][OUT_USHORT][PIPE_PRIM_QUAD_STRIP] = translate_quadstrip_uint2ushort; translate_line[IN_UINT][OUT_USHORT][PIPE_PRIM_POLYGON] = translate_polygon_uint2ushort; -translate_line[IN_UINT][OUT_USHORT][PIPE_PRIM_TRIANGLES_ADJACENCY] = translate_trisadj_uint2ushort; -translate_line[IN_UINT][OUT_USHORT][PIPE_PRIM_TRIANGLE_STRIP_ADJACENCY] = translate_tristripadj_uint2ushort; translate_line[IN_UINT][OUT_UINT][PIPE_PRIM_TRIANGLES] = translate_tris_uint2uint; translate_line[IN_UINT][OUT_UINT][PIPE_PRIM_TRIANGLE_FAN] = translate_trifan_uint2uint; translate_line[IN_UINT][OUT_UINT][PIPE_PRIM_TRIANGLE_STRIP] = translate_tristrip_uint2uint; translate_line[IN_UINT][OUT_UINT][PIPE_PRIM_QUADS] = translate_quads_uint2uint; translate_line[IN_UINT][OUT_UINT][PIPE_PRIM_QUAD_STRIP] = translate_quadstrip_uint2uint; translate_line[IN_UINT][OUT_UINT][PIPE_PRIM_POLYGON] = translate_polygon_uint2uint; -translate_line[IN_UINT][OUT_UINT][PIPE_PRIM_TRIANGLES_ADJACENCY] = translate_trisadj_uint2uint; -translate_line[IN_UINT][OUT_UINT][PIPE_PRIM_TRIANGLE_STRIP_ADJACENCY] = translate_tristripadj_uint2uint; } #include "indices/u_unfilled_indices.c" diff --git a/lib/mesa/src/gallium/auxiliary/pipe-loader/Makefile.am b/lib/mesa/src/gallium/auxiliary/pipe-loader/Makefile.am index 718e5afad..8c8379965 100644 --- a/lib/mesa/src/gallium/auxiliary/pipe-loader/Makefile.am +++ b/lib/mesa/src/gallium/auxiliary/pipe-loader/Makefile.am @@ -5,47 +5,24 @@ include $(top_srcdir)/src/gallium/Automake.inc AM_CFLAGS = \ -I$(top_srcdir)/src/loader \ -I$(top_srcdir)/src/gallium/winsys \ - -I$(top_builddir)/src/util \ $(GALLIUM_PIPE_LOADER_DEFINES) \ $(GALLIUM_CFLAGS) \ $(VISIBILITY_CFLAGS) -noinst_LTLIBRARIES = \ - libpipe_loader_static.la \ - libpipe_loader_dynamic.la +noinst_LTLIBRARIES = libpipe_loader.la -libpipe_loader_static_la_CFLAGS = \ - $(AM_CFLAGS) \ - -DGALLIUM_STATIC_TARGETS=1 - -libpipe_loader_dynamic_la_CFLAGS = \ - $(AM_CFLAGS) \ - -DPIPE_SEARCH_DIR=\"$(libdir)/gallium-pipe\" - -libpipe_loader_static_la_SOURCES = \ - $(COMMON_SOURCES) - -libpipe_loader_dynamic_la_SOURCES = \ +libpipe_loader_la_SOURCES = \ $(COMMON_SOURCES) -if HAVE_LIBDRM +if HAVE_DRM_LOADER_GALLIUM AM_CFLAGS += \ $(LIBDRM_CFLAGS) -libpipe_loader_static_la_SOURCES += \ +libpipe_loader_la_SOURCES += \ $(DRM_SOURCES) -libpipe_loader_dynamic_la_SOURCES += \ - $(DRM_SOURCES) +libpipe_loader_la_LIBADD = \ + $(top_builddir)/src/loader/libloader.la endif -libpipe_loader_static_la_LIBADD = \ - $(top_builddir)/src/loader/libloader.la \ - $(top_builddir)/src/util/libxmlconfig.la - -libpipe_loader_dynamic_la_LIBADD = \ - $(top_builddir)/src/loader/libloader.la \ - $(top_builddir)/src/util/libxmlconfig.la - -EXTRA_DIST = SConscript meson.build diff --git a/lib/mesa/src/gallium/auxiliary/pipebuffer/pb_buffer_malloc.c b/lib/mesa/src/gallium/auxiliary/pipebuffer/pb_buffer_malloc.c index ea2f2fa10..b97771457 100644 --- a/lib/mesa/src/gallium/auxiliary/pipebuffer/pb_buffer_malloc.c +++ b/lib/mesa/src/gallium/auxiliary/pipebuffer/pb_buffer_malloc.c @@ -132,7 +132,7 @@ pb_malloc_buffer_create(pb_size size, /* TODO: do a single allocation */ buf = CALLOC_STRUCT(malloc_buffer); - if (!buf) + if(!buf) return NULL; pipe_reference_init(&buf->base.reference, 1); diff --git a/lib/mesa/src/gallium/auxiliary/pipebuffer/pb_bufmgr_alt.c b/lib/mesa/src/gallium/auxiliary/pipebuffer/pb_bufmgr_alt.c index f71bacc88..47cbaeb20 100644 --- a/lib/mesa/src/gallium/auxiliary/pipebuffer/pb_bufmgr_alt.c +++ b/lib/mesa/src/gallium/auxiliary/pipebuffer/pb_bufmgr_alt.c @@ -67,7 +67,7 @@ pb_alt_manager_create_buffer(struct pb_manager *_mgr, struct pb_buffer *buf; buf = mgr->provider1->create_buffer(mgr->provider1, size, desc); - if (buf) + if(buf) return buf; buf = mgr->provider2->create_buffer(mgr->provider2, size, desc); diff --git a/lib/mesa/src/gallium/auxiliary/pipebuffer/pb_bufmgr_ondemand.c b/lib/mesa/src/gallium/auxiliary/pipebuffer/pb_bufmgr_ondemand.c index 4885d68c3..c20e2dca0 100644 --- a/lib/mesa/src/gallium/auxiliary/pipebuffer/pb_bufmgr_ondemand.c +++ b/lib/mesa/src/gallium/auxiliary/pipebuffer/pb_bufmgr_ondemand.c @@ -151,7 +151,7 @@ pb_ondemand_buffer_instantiate(struct pb_ondemand_buffer *buf) return PIPE_ERROR_OUT_OF_MEMORY; map = pb_map(buf->buffer, PB_USAGE_CPU_READ, NULL); - if (!map) { + if(!map) { pb_reference(&buf->buffer, NULL); return PIPE_ERROR; } @@ -241,7 +241,7 @@ pb_ondemand_manager_create_buffer(struct pb_manager *_mgr, struct pb_ondemand_buffer *buf; buf = CALLOC_STRUCT(pb_ondemand_buffer); - if (!buf) + if(!buf) return NULL; pipe_reference_init(&buf->base.reference, 1); @@ -288,11 +288,11 @@ pb_ondemand_manager_create(struct pb_manager *provider) { struct pb_ondemand_manager *mgr; - if (!provider) + if(!provider) return NULL; mgr = CALLOC_STRUCT(pb_ondemand_manager); - if (!mgr) + if(!mgr) return NULL; mgr->base.destroy = pb_ondemand_manager_destroy; diff --git a/lib/mesa/src/gallium/drivers/freedreno/Automake.inc b/lib/mesa/src/gallium/drivers/freedreno/Automake.inc index 936c286f4..1fdf91cf3 100644 --- a/lib/mesa/src/gallium/drivers/freedreno/Automake.inc +++ b/lib/mesa/src/gallium/drivers/freedreno/Automake.inc @@ -5,8 +5,6 @@ TARGET_CPPFLAGS += -DGALLIUM_FREEDRENO TARGET_LIB_DEPS += \ $(top_builddir)/src/gallium/winsys/freedreno/drm/libfreedrenodrm.la \ $(top_builddir)/src/gallium/drivers/freedreno/libfreedreno.la \ - $(top_builddir)/src/freedreno/libfreedreno_drm.la \ - $(top_builddir)/src/freedreno/libfreedreno_ir3.la \ $(FREEDRENO_LIBS) \ $(LIBDRM_LIBS) diff --git a/lib/mesa/src/gallium/drivers/i915/Makefile.am b/lib/mesa/src/gallium/drivers/i915/Makefile.am index 261f292fd..eb3c964a3 100644 --- a/lib/mesa/src/gallium/drivers/i915/Makefile.am +++ b/lib/mesa/src/gallium/drivers/i915/Makefile.am @@ -30,4 +30,4 @@ noinst_LTLIBRARIES = libi915.la libi915_la_SOURCES = $(C_SOURCES) -EXTRA_DIST = TODO meson.build +EXTRA_DIST = TODO diff --git a/lib/mesa/src/gallium/drivers/nouveau/Makefile.am b/lib/mesa/src/gallium/drivers/nouveau/Makefile.am index f6126b544..c52d62e54 100644 --- a/lib/mesa/src/gallium/drivers/nouveau/Makefile.am +++ b/lib/mesa/src/gallium/drivers/nouveau/Makefile.am @@ -24,7 +24,6 @@ include Makefile.sources include $(top_srcdir)/src/gallium/Automake.inc AM_CPPFLAGS = \ - -I$(top_srcdir)/include/drm-uapi \ $(GALLIUM_DRIVER_CFLAGS) \ $(LIBDRM_CFLAGS) \ $(NOUVEAU_CFLAGS) @@ -51,4 +50,4 @@ nouveau_compiler_LDADD = \ $(top_builddir)/src/util/libmesautil.la \ $(GALLIUM_COMMON_LIB_DEPS) -EXTRA_DIST = codegen/lib nvc0/mme meson.build +EXTRA_DIST = codegen/lib nvc0/mme diff --git a/lib/mesa/src/gallium/drivers/nouveau/nouveau_statebuf.h b/lib/mesa/src/gallium/drivers/nouveau/nouveau_statebuf.h index da5d7972d..f38014091 100644 --- a/lib/mesa/src/gallium/drivers/nouveau/nouveau_statebuf.h +++ b/lib/mesa/src/gallium/drivers/nouveau/nouveau_statebuf.h @@ -6,9 +6,9 @@ struct nouveau_statebuf_builder { - uint32_t* p; + uint32_t* p; #ifdef DEBUG - uint32_t* pend; + uint32_t* pend; #endif }; @@ -22,7 +22,7 @@ struct nouveau_statebuf_builder static inline uint32_t sb_header(unsigned subc, unsigned mthd, unsigned size) { - return (size << 18) | (subc << 13) | mthd; + return (size << 18) | (subc << 13) | mthd; } #define sb_method(sb, v, n) sb_data(sb, sb_header(SUBC_3D(v), n)); diff --git a/lib/mesa/src/gallium/drivers/r300/Makefile.am b/lib/mesa/src/gallium/drivers/r300/Makefile.am index 26c75be32..081f33268 100644 --- a/lib/mesa/src/gallium/drivers/r300/Makefile.am +++ b/lib/mesa/src/gallium/drivers/r300/Makefile.am @@ -28,5 +28,4 @@ libr300_la_SOURCES = $(C_SOURCES) EXTRA_DIST = \ compiler/tests/omod_two_writers.test \ - compiler/tests/regalloc_tex_1d_swizzle.test \ - meson.build + compiler/tests/regalloc_tex_1d_swizzle.test diff --git a/lib/mesa/src/gallium/drivers/softpipe/Automake.inc b/lib/mesa/src/gallium/drivers/softpipe/Automake.inc index bd3c2eead..6455f3caa 100644 --- a/lib/mesa/src/gallium/drivers/softpipe/Automake.inc +++ b/lib/mesa/src/gallium/drivers/softpipe/Automake.inc @@ -3,10 +3,13 @@ if HAVE_GALLIUM_SOFTPIPE TARGET_DRIVERS += swrast TARGET_CPPFLAGS += -DGALLIUM_SOFTPIPE TARGET_LIB_DEPS += \ + $(top_builddir)/src/gallium/winsys/sw/dri/libswdri.la \ $(top_builddir)/src/gallium/drivers/softpipe/libsoftpipe.la -if HAVE_DRISW_KMS +if HAVE_DRI2 TARGET_DRIVERS += kms_swrast +TARGET_LIB_DEPS += \ + $(top_builddir)/src/gallium/winsys/sw/kms-dri/libswkmsdri.la endif endif diff --git a/lib/mesa/src/gallium/drivers/softpipe/Makefile.am b/lib/mesa/src/gallium/drivers/softpipe/Makefile.am index c8c2615a9..05126a5db 100644 --- a/lib/mesa/src/gallium/drivers/softpipe/Makefile.am +++ b/lib/mesa/src/gallium/drivers/softpipe/Makefile.am @@ -25,10 +25,10 @@ include $(top_srcdir)/src/gallium/Automake.inc AM_CFLAGS = \ $(GALLIUM_DRIVER_CFLAGS) \ - $(MSVC2013_COMPAT_CFLAGS) + $(MSVC2008_COMPAT_CFLAGS) noinst_LTLIBRARIES = libsoftpipe.la libsoftpipe_la_SOURCES = $(C_SOURCES) -EXTRA_DIST = SConscript meson.build +EXTRA_DIST = SConscript diff --git a/lib/mesa/src/gallium/drivers/vc4/Automake.inc b/lib/mesa/src/gallium/drivers/vc4/Automake.inc index 650466e49..6fa3e190c 100644 --- a/lib/mesa/src/gallium/drivers/vc4/Automake.inc +++ b/lib/mesa/src/gallium/drivers/vc4/Automake.inc @@ -2,18 +2,12 @@ if HAVE_GALLIUM_VC4 TARGET_DRIVERS += vc4 TARGET_CPPFLAGS += -DGALLIUM_VC4 - -if !HAVE_GALLIUM_V3D -TARGET_LIB_DEPS += \ - $(top_builddir)/src/broadcom/libbroadcom.la \ - $(top_builddir)/src/broadcom/libbroadcom_v33.la \ - $(top_builddir)/src/broadcom/libbroadcom_v41.la -endif - TARGET_LIB_DEPS += \ $(top_builddir)/src/gallium/winsys/vc4/drm/libvc4drm.la \ - $(top_builddir)/src/gallium/drivers/vc4/libvc4.la \ - $(top_builddir)/src/broadcom/cle/libbroadcom_cle.la + $(top_builddir)/src/gallium/drivers/vc4/libvc4.la +if USE_VC4_SIMULATOR +TARGET_CPPFLAGS += -DUSE_VC4_SIMULATOR +endif endif diff --git a/lib/mesa/src/gallium/state_trackers/dri/Makefile.am b/lib/mesa/src/gallium/state_trackers/dri/Makefile.am index d66e585b1..9f4deba0c 100644 --- a/lib/mesa/src/gallium/state_trackers/dri/Makefile.am +++ b/lib/mesa/src/gallium/state_trackers/dri/Makefile.am @@ -25,19 +25,26 @@ include Makefile.sources include $(top_srcdir)/src/gallium/Automake.inc AM_CPPFLAGS = \ + $(GALLIUM_PIPE_LOADER_DEFINES) \ + -DPIPE_SEARCH_DIR=\"$(libdir)/gallium-pipe\" \ -I$(top_srcdir)/include \ -I$(top_srcdir)/src/mapi \ -I$(top_srcdir)/src/mesa \ - -I$(top_builddir)/src/util \ -I$(top_srcdir)/src/mesa/drivers/dri/common \ + -I$(top_builddir)/src/mesa/drivers/dri/common \ $(GALLIUM_CFLAGS) \ $(LIBDRM_CFLAGS) \ $(VISIBILITY_CFLAGS) +if HAVE_GALLIUM_STATIC_TARGETS +AM_CPPFLAGS += \ + -DGALLIUM_STATIC_TARGETS=1 + if HAVE_GALLIUM_SOFTPIPE AM_CPPFLAGS += \ -DGALLIUM_SOFTPIPE endif # HAVE_GALLIUM_SOFTPIPE +endif # HAVE_GALLIUM_STATIC_TARGETS noinst_LTLIBRARIES = libdri.la libdri_la_SOURCES = $(common_SOURCES) @@ -51,4 +58,4 @@ if HAVE_DRI2 libdri_la_SOURCES += $(dri2_SOURCES) endif -EXTRA_DIST = SConscript meson.build +EXTRA_DIST = SConscript diff --git a/lib/mesa/src/gallium/state_trackers/glx/xlib/Makefile.am b/lib/mesa/src/gallium/state_trackers/glx/xlib/Makefile.am index 914d4a5b8..a7e6c0c87 100644 --- a/lib/mesa/src/gallium/state_trackers/glx/xlib/Makefile.am +++ b/lib/mesa/src/gallium/state_trackers/glx/xlib/Makefile.am @@ -25,7 +25,6 @@ include $(top_srcdir)/src/gallium/Automake.inc AM_CFLAGS = \ $(GALLIUM_CFLAGS) \ - $(GLPROTO_CFLAGS) \ $(X11_INCLUDES) AM_CPPFLAGS = \ -I$(top_srcdir)/include \ @@ -36,4 +35,4 @@ noinst_LTLIBRARIES = libxlib.la libxlib_la_SOURCES = $(C_SOURCES) -EXTRA_DIST = SConscript meson.build +EXTRA_DIST = SConscript diff --git a/lib/mesa/src/gallium/state_trackers/nine/Makefile.am b/lib/mesa/src/gallium/state_trackers/nine/Makefile.am index 2a66df8b9..c0c75b34c 100644 --- a/lib/mesa/src/gallium/state_trackers/nine/Makefile.am +++ b/lib/mesa/src/gallium/state_trackers/nine/Makefile.am @@ -10,4 +10,4 @@ noinst_LTLIBRARIES = libninetracker.la libninetracker_la_SOURCES = $(C_SOURCES) -EXTRA_DIST = README meson.build +EXTRA_DIST = README diff --git a/lib/mesa/src/gallium/state_trackers/osmesa/Makefile.am b/lib/mesa/src/gallium/state_trackers/osmesa/Makefile.am index 05e3ca0d7..22e65c881 100644 --- a/lib/mesa/src/gallium/state_trackers/osmesa/Makefile.am +++ b/lib/mesa/src/gallium/state_trackers/osmesa/Makefile.am @@ -33,10 +33,11 @@ AM_CPPFLAGS = \ -I$(top_srcdir)/src/gallium/winsys \ -I$(top_srcdir)/src/gallium/state_trackers/glx/xlib \ -I$(top_srcdir)/src/gallium/auxiliary \ - -DGALLIUM_SOFTPIPE + -DGALLIUM_SOFTPIPE \ + -DGALLIUM_TRACE noinst_LTLIBRARIES = libosmesa.la libosmesa_la_SOURCES = $(C_SOURCES) -EXTRA_DIST = SConscript meson.build +EXTRA_DIST = SConscript diff --git a/lib/mesa/src/gallium/state_trackers/xa/xa_tracker.h b/lib/mesa/src/gallium/state_trackers/xa/xa_tracker.h index 40637eb29..5c6435e19 100644 --- a/lib/mesa/src/gallium/state_trackers/xa/xa_tracker.h +++ b/lib/mesa/src/gallium/state_trackers/xa/xa_tracker.h @@ -37,7 +37,7 @@ #include <stdint.h> #define XA_TRACKER_VERSION_MAJOR 2 -#define XA_TRACKER_VERSION_MINOR 5 +#define XA_TRACKER_VERSION_MINOR 2 #define XA_TRACKER_VERSION_PATCH 0 #define XA_FLAG_SHARED (1 << 0) @@ -126,11 +126,6 @@ enum xa_formats { xa_format_x8r8g8b8 = xa_format(32, xa_type_argb, 0, 8, 8, 8), xa_format_r5g6b5 = xa_format(16, xa_type_argb, 0, 5, 6, 5), xa_format_x1r5g5b5 = xa_format(16, xa_type_argb, 0, 5, 5, 5), - xa_format_a4r4g4b4 = xa_format(16, xa_type_argb, 4, 4, 4, 4), - xa_format_a2b10g10r10 = xa_format(32, xa_type_abgr, 2, 10, 10, 10), - xa_format_x2b10g10r10 = xa_format(32, xa_type_abgr, 0, 10, 10, 10), - xa_format_b8g8r8a8 = xa_format(32, xa_type_bgra, 8, 8, 8, 8), - xa_format_b8g8r8x8 = xa_format(32, xa_type_bgra, 0, 8, 8, 8), xa_format_z16 = xa_format_c(16, xa_type_z, 16, 0), xa_format_z32 = xa_format_c(32, xa_type_z, 32, 0), @@ -154,7 +149,6 @@ struct xa_box { enum xa_handle_type { xa_handle_type_shared, xa_handle_type_kms, - xa_handle_type_fd, }; extern void xa_tracker_version(int *major, int *minor, int *patch); @@ -183,17 +177,6 @@ extern struct xa_surface * xa_surface_from_handle(struct xa_tracker *xa, enum xa_formats pform, unsigned int flags, uint32_t handle, uint32_t stride); -extern struct xa_surface * -xa_surface_from_handle2(struct xa_tracker *xa, - int width, - int height, - int depth, - enum xa_surface_type stype, - enum xa_formats xa_format, - unsigned int flags, - enum xa_handle_type type, - uint32_t handle, - uint32_t stride); enum xa_formats xa_surface_format(const struct xa_surface *srf); diff --git a/lib/mesa/src/gallium/tests/trivial/Makefile.am b/lib/mesa/src/gallium/tests/trivial/Makefile.am index db9a54ff0..56b7f3ffc 100644 --- a/lib/mesa/src/gallium/tests/trivial/Makefile.am +++ b/lib/mesa/src/gallium/tests/trivial/Makefile.am @@ -5,10 +5,17 @@ PIPE_SRC_DIR = $(top_builddir)/src/gallium/targets/pipe-loader AM_CFLAGS = \ $(GALLIUM_CFLAGS) +AM_CPPFLAGS = \ + -I$(top_srcdir)/src/gallium/drivers \ + -I$(top_srcdir)/src/gallium/winsys \ + -DPIPE_SEARCH_DIR=\"$(PIPE_SRC_DIR)/.libs\" \ + $(GALLIUM_PIPE_LOADER_DEFINES) + LDADD = \ - $(top_builddir)/src/gallium/auxiliary/pipe-loader/libpipe_loader_dynamic.la \ + $(top_builddir)/src/gallium/auxiliary/pipe-loader/libpipe_loader.la \ $(top_builddir)/src/gallium/auxiliary/libgallium.la \ $(top_builddir)/src/util/libmesautil.la \ + $(GALLIUM_PIPE_LOADER_WINSYS_LIBS) \ $(GALLIUM_COMMON_LIB_DEPS) noinst_PROGRAMS = compute tri quad-tex @@ -19,7 +26,5 @@ tri_SOURCES = tri.c quad_tex_SOURCES = quad-tex.c -EXTRA_DIST = meson.build - clean-local: -rm -f result.bmp diff --git a/lib/mesa/src/gallium/tests/unit/Makefile.am b/lib/mesa/src/gallium/tests/unit/Makefile.am index 74d125fe4..c9bede75b 100644 --- a/lib/mesa/src/gallium/tests/unit/Makefile.am +++ b/lib/mesa/src/gallium/tests/unit/Makefile.am @@ -2,7 +2,7 @@ include $(top_srcdir)/src/gallium/Automake.inc -EXTRA_DIST = SConscript meson.build +EXTRA_DIST = SConscript AM_CFLAGS = \ $(GALLIUM_CFLAGS) @@ -14,6 +14,7 @@ AM_CPPFLAGS = \ LDADD = \ $(top_builddir)/src/gallium/auxiliary/libgallium.la \ $(top_builddir)/src/util/libmesautil.la \ + $(top_builddir)/src/gallium/drivers/trace/libtrace.la \ $(top_builddir)/src/gallium/winsys/sw/null/libws_null.la \ $(top_builddir)/src/gallium/drivers/softpipe/libsoftpipe.la \ $(GALLIUM_COMMON_LIB_DEPS) diff --git a/lib/mesa/src/gallium/winsys/freedreno/drm/Makefile.am b/lib/mesa/src/gallium/winsys/freedreno/drm/Makefile.am index 16184dfd9..cf4c24cb8 100644 --- a/lib/mesa/src/gallium/winsys/freedreno/drm/Makefile.am +++ b/lib/mesa/src/gallium/winsys/freedreno/drm/Makefile.am @@ -25,13 +25,9 @@ include $(top_srcdir)/src/gallium/Automake.inc AM_CFLAGS = \ -I$(top_srcdir)/src/gallium/drivers \ - -I$(top_srcdir)/src/freedreno \ - -I$(top_srcdir)/src/freedreno/registers \ $(GALLIUM_WINSYS_CFLAGS) \ $(FREEDRENO_CFLAGS) noinst_LTLIBRARIES = libfreedrenodrm.la libfreedrenodrm_la_SOURCES = $(C_SOURCES) - -EXTRA_DIST = meson.build diff --git a/lib/mesa/src/gallium/winsys/nouveau/drm/Makefile.am b/lib/mesa/src/gallium/winsys/nouveau/drm/Makefile.am index 992fa25cc..9c94ea481 100644 --- a/lib/mesa/src/gallium/winsys/nouveau/drm/Makefile.am +++ b/lib/mesa/src/gallium/winsys/nouveau/drm/Makefile.am @@ -31,5 +31,3 @@ AM_CFLAGS = \ noinst_LTLIBRARIES = libnouveaudrm.la libnouveaudrm_la_SOURCES = $(C_SOURCES) - -EXTRA_DIST = meson.build diff --git a/lib/mesa/src/gallium/winsys/radeon/drm/Makefile.am b/lib/mesa/src/gallium/winsys/radeon/drm/Makefile.am index c94c9b3a9..0320aca01 100644 --- a/lib/mesa/src/gallium/winsys/radeon/drm/Makefile.am +++ b/lib/mesa/src/gallium/winsys/radeon/drm/Makefile.am @@ -9,4 +9,4 @@ noinst_LTLIBRARIES = libradeonwinsys.la libradeonwinsys_la_SOURCES = $(C_SOURCES) -EXTRA_DIST = meson.build +EXTRA_DIST = $(TOOLS_HDR) diff --git a/lib/mesa/src/gallium/winsys/svga/drm/Makefile.am b/lib/mesa/src/gallium/winsys/svga/drm/Makefile.am index 46bf5d85f..dfa973676 100644 --- a/lib/mesa/src/gallium/winsys/svga/drm/Makefile.am +++ b/lib/mesa/src/gallium/winsys/svga/drm/Makefile.am @@ -29,8 +29,11 @@ AM_CFLAGS = \ $(GALLIUM_WINSYS_CFLAGS) \ $(LIBDRM_CFLAGS) +#On some systems -std= must be added to CFLAGS to be the last -std= +CFLAGS += -std=gnu99 + noinst_LTLIBRARIES = libsvgadrm.la libsvgadrm_la_SOURCES = $(C_SOURCES) -EXTRA_DIST = SConscript meson.build +EXTRA_DIST = SConscript diff --git a/lib/mesa/src/gallium/winsys/sw/dri/Makefile.am b/lib/mesa/src/gallium/winsys/sw/dri/Makefile.am index ecf63d17d..a7d325383 100644 --- a/lib/mesa/src/gallium/winsys/sw/dri/Makefile.am +++ b/lib/mesa/src/gallium/winsys/sw/dri/Makefile.am @@ -30,4 +30,4 @@ noinst_LTLIBRARIES = libswdri.la libswdri_la_SOURCES = $(C_SOURCES) -EXTRA_DIST = SConscript meson.build +EXTRA_DIST = SConscript diff --git a/lib/mesa/src/gallium/winsys/sw/kms-dri/Makefile.am b/lib/mesa/src/gallium/winsys/sw/kms-dri/Makefile.am index 022f3c508..816255328 100644 --- a/lib/mesa/src/gallium/winsys/sw/kms-dri/Makefile.am +++ b/lib/mesa/src/gallium/winsys/sw/kms-dri/Makefile.am @@ -31,5 +31,3 @@ AM_CFLAGS = \ noinst_LTLIBRARIES = libswkmsdri.la libswkmsdri_la_SOURCES = $(C_SOURCES) - -EXTRA_DIST = meson.build diff --git a/lib/mesa/src/gallium/winsys/sw/null/Makefile.am b/lib/mesa/src/gallium/winsys/sw/null/Makefile.am index c20518919..3da568442 100644 --- a/lib/mesa/src/gallium/winsys/sw/null/Makefile.am +++ b/lib/mesa/src/gallium/winsys/sw/null/Makefile.am @@ -30,4 +30,4 @@ noinst_LTLIBRARIES = libws_null.la libws_null_la_SOURCES = $(C_SOURCES) -EXTRA_DIST = SConscript meson.build +EXTRA_DIST = SConscript diff --git a/lib/mesa/src/gallium/winsys/sw/wrapper/Makefile.am b/lib/mesa/src/gallium/winsys/sw/wrapper/Makefile.am index 7cd03a4c2..7a9f1ce6e 100644 --- a/lib/mesa/src/gallium/winsys/sw/wrapper/Makefile.am +++ b/lib/mesa/src/gallium/winsys/sw/wrapper/Makefile.am @@ -30,4 +30,4 @@ noinst_LTLIBRARIES = libwsw.la libwsw_la_SOURCES = $(C_SOURCES) -EXTRA_DIST = SConscript meson.build +EXTRA_DIST = SConscript diff --git a/lib/mesa/src/gallium/winsys/sw/xlib/Makefile.am b/lib/mesa/src/gallium/winsys/sw/xlib/Makefile.am index e518dda82..c7ed33bc4 100644 --- a/lib/mesa/src/gallium/winsys/sw/xlib/Makefile.am +++ b/lib/mesa/src/gallium/winsys/sw/xlib/Makefile.am @@ -31,4 +31,4 @@ noinst_LTLIBRARIES = libws_xlib.la libws_xlib_la_SOURCES = $(C_SOURCES) -EXTRA_DIST = SConscript meson.build +EXTRA_DIST = SConscript diff --git a/lib/mesa/src/gallium/winsys/vc4/drm/Makefile.am b/lib/mesa/src/gallium/winsys/vc4/drm/Makefile.am index a32709bff..3bbeb30f1 100644 --- a/lib/mesa/src/gallium/winsys/vc4/drm/Makefile.am +++ b/lib/mesa/src/gallium/winsys/vc4/drm/Makefile.am @@ -29,5 +29,3 @@ AM_CFLAGS = \ noinst_LTLIBRARIES = libvc4drm.la libvc4drm_la_SOURCES = $(C_SOURCES) - -EXTRA_DIST = meson.build diff --git a/lib/mesa/src/glx/indirect_init.c b/lib/mesa/src/glx/indirect_init.c index d6e911ca3..25d9aa219 100644 --- a/lib/mesa/src/glx/indirect_init.c +++ b/lib/mesa/src/glx/indirect_init.c @@ -4,18 +4,18 @@ * Copyright 1998-1999 Precision Insight, Inc., Cedar Park, Texas. * (C) Copyright IBM Corporation 2004 * All Rights Reserved. - * + * * 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, sub license, * 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 NON-INFRINGEMENT. IN NO EVENT SHALL diff --git a/lib/mesa/src/gtest/Makefile.am b/lib/mesa/src/gtest/Makefile.am index 23b755361..29d6c6d19 100644 --- a/lib/mesa/src/gtest/Makefile.am +++ b/lib/mesa/src/gtest/Makefile.am @@ -37,5 +37,4 @@ EXTRA_DIST = \ src/gtest-port.cc \ src/gtest-printers.cc \ src/gtest-test-part.cc \ - src/gtest-typed-test.cc \ - meson.build + src/gtest-typed-test.cc diff --git a/lib/mesa/src/mesa/drivers/dri/nouveau/Makefile.am b/lib/mesa/src/mesa/drivers/dri/nouveau/Makefile.am index 59fd7fce7..01e34a8e3 100644 --- a/lib/mesa/src/mesa/drivers/dri/nouveau/Makefile.am +++ b/lib/mesa/src/mesa/drivers/dri/nouveau/Makefile.am @@ -26,8 +26,7 @@ include Makefile.sources EXTRA_DIST = \ nouveau_render_t.c \ nouveau_swtnl_t.c \ - nouveau_vbo_t.c \ - meson.build + nouveau_vbo_t.c AM_CFLAGS = \ -I$(top_srcdir)/include \ diff --git a/lib/mesa/src/mesa/drivers/dri/r200/Makefile.am b/lib/mesa/src/mesa/drivers/dri/r200/Makefile.am index 3d15c0199..137d3c85a 100644 --- a/lib/mesa/src/mesa/drivers/dri/r200/Makefile.am +++ b/lib/mesa/src/mesa/drivers/dri/r200/Makefile.am @@ -24,8 +24,7 @@ include Makefile.sources EXTRA_DIST = \ - r200_maos_arrays.c \ - meson.build + r200_maos_arrays.c AM_CFLAGS = \ -DRADEON_R200 \ @@ -35,9 +34,9 @@ AM_CFLAGS = \ -I$(top_srcdir)/src/mesa/ \ -I$(top_srcdir)/src/gallium/include \ -I$(top_srcdir)/src/gallium/auxiliary \ - -I$(top_builddir)/src/util \ -I$(top_srcdir)/src/mesa/drivers/dri/common \ -I$(top_srcdir)/src/mesa/drivers/dri/r200/server \ + -I$(top_builddir)/src/mesa/drivers/dri/common \ $(DEFINES) \ $(VISIBILITY_CFLAGS) \ $(RADEON_CFLAGS) diff --git a/lib/mesa/src/mesa/drivers/dri/r200/radeon_buffer_objects.c b/lib/mesa/src/mesa/drivers/dri/r200/radeon_buffer_objects.c index 2b76305dd..d9d4f5ffc 100644 --- a/lib/mesa/src/mesa/drivers/dri/r200/radeon_buffer_objects.c +++ b/lib/mesa/src/mesa/drivers/dri/r200/radeon_buffer_objects.c @@ -71,7 +71,7 @@ radeonDeleteBufferObject(struct gl_context * ctx, radeon_bo_unref(radeon_obj->bo); } - _mesa_delete_buffer_object(ctx, obj); + free(radeon_obj); } diff --git a/lib/mesa/src/mesa/drivers/dri/r200/radeon_common.h b/lib/mesa/src/mesa/drivers/dri/r200/radeon_common.h index a39b9360e..fedaf5063 100644 --- a/lib/mesa/src/mesa/drivers/dri/r200/radeon_common.h +++ b/lib/mesa/src/mesa/drivers/dri/r200/radeon_common.h @@ -21,7 +21,7 @@ void radeon_clear_tris(struct gl_context *ctx, GLbitfield mask); void radeon_window_moved(radeonContextPtr radeon); void radeon_draw_buffer(struct gl_context *ctx, struct gl_framebuffer *fb); -void radeonDrawBuffer(struct gl_context *ctx); +void radeonDrawBuffer( struct gl_context *ctx, GLenum mode ); void radeonReadBuffer( struct gl_context *ctx, GLenum mode ); void radeon_viewport(struct gl_context *ctx); void radeon_fbo_init(struct radeon_context *radeon); @@ -37,6 +37,7 @@ radeonReadPixels(struct gl_context * ctx, GLenum format, GLenum type, const struct gl_pixelstore_attrib *pack, GLvoid * pixels); +void radeon_check_front_buffer_rendering(struct gl_context *ctx); static inline struct radeon_renderbuffer *radeon_renderbuffer(struct gl_renderbuffer *rb) { struct radeon_renderbuffer *rrb = (struct radeon_renderbuffer *)rb; diff --git a/lib/mesa/src/mesa/drivers/dri/r200/radeon_debug.c b/lib/mesa/src/mesa/drivers/dri/r200/radeon_debug.c index 91f86a96b..7ddba1ae8 100644 --- a/lib/mesa/src/mesa/drivers/dri/r200/radeon_debug.c +++ b/lib/mesa/src/mesa/drivers/dri/r200/radeon_debug.c @@ -27,7 +27,7 @@ * Pauli Nieminen <suokkos@gmail.com> */ -#include "util/debug.h" +#include "utils.h" #include "radeon_common_context.h" #include "radeon_debug.h" @@ -35,7 +35,7 @@ #include <stdarg.h> #include <stdio.h> -static const struct debug_control debug_control[] = { +static const struct dri_debug_control debug_control[] = { {"fall", RADEON_FALLBACKS}, {"tex", RADEON_TEXTURE}, {"ioctl", RADEON_IOCTL}, @@ -61,7 +61,7 @@ radeon_debug_type_t radeon_enabled_debug_types; void radeon_init_debug(void) { - radeon_enabled_debug_types = parse_debug_string(getenv("RADEON_DEBUG"), debug_control); + radeon_enabled_debug_types = driParseDebugString(getenv("RADEON_DEBUG"), debug_control); radeon_enabled_debug_types |= RADEON_GENERAL; } @@ -75,7 +75,7 @@ void _radeon_debug_add_indent(void) if (radeon->debug.indent_depth < length - 1) { radeon->debug.indent[radeon->debug.indent_depth] = '\t'; ++radeon->debug.indent_depth; - } + }; } void _radeon_debug_remove_indent(void) diff --git a/lib/mesa/src/mesa/drivers/dri/r200/radeon_dma.c b/lib/mesa/src/mesa/drivers/dri/r200/radeon_dma.c index 99c73d6ff..4c1c5d046 100644 --- a/lib/mesa/src/mesa/drivers/dri/r200/radeon_dma.c +++ b/lib/mesa/src/mesa/drivers/dri/r200/radeon_dma.c @@ -217,7 +217,7 @@ void radeonRefillCurrentDmaRegion(radeonContextPtr rmesa, int size) if (size > rmesa->dma.minimum_size) rmesa->dma.minimum_size = (size + 15) & (~15); - radeon_print(RADEON_DMA, RADEON_NORMAL, "%s size %d minimum_size %zi\n", + radeon_print(RADEON_DMA, RADEON_NORMAL, "%s size %d minimum_size %Zi\n", __func__, size, rmesa->dma.minimum_size); if (is_empty_list(&rmesa->dma.free) diff --git a/lib/mesa/src/mesa/drivers/dri/r200/radeon_screen.h b/lib/mesa/src/mesa/drivers/dri/r200/radeon_screen.h index af1b9454e..b3e926798 100644 --- a/lib/mesa/src/mesa/drivers/dri/r200/radeon_screen.h +++ b/lib/mesa/src/mesa/drivers/dri/r200/radeon_screen.h @@ -45,70 +45,8 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #include "dri_util.h" #include "radeon_chipset.h" #include "radeon_reg.h" -#include "util/xmlconfig.h" +#include "xmlconfig.h" -#define DRI_CONF_COLOR_REDUCTION_ROUND 0 -#define DRI_CONF_COLOR_REDUCTION_DITHER 1 -#define DRI_CONF_COLOR_REDUCTION(def) \ -DRI_CONF_OPT_BEGIN_V(color_reduction,enum,def,"0:1") \ - DRI_CONF_DESC_BEGIN(en,"Initial color reduction method") \ - DRI_CONF_ENUM(0,"Round colors") \ - DRI_CONF_ENUM(1,"Dither colors") \ - DRI_CONF_DESC_END \ -DRI_CONF_OPT_END - -#define DRI_CONF_DITHER_XERRORDIFF 0 -#define DRI_CONF_DITHER_XERRORDIFFRESET 1 -#define DRI_CONF_DITHER_ORDERED 2 -#define DRI_CONF_DITHER_MODE(def) \ -DRI_CONF_OPT_BEGIN_V(dither_mode,enum,def,"0:2") \ - DRI_CONF_DESC_BEGIN(en,"Color dithering method") \ - DRI_CONF_ENUM(0,"Horizontal error diffusion") \ - DRI_CONF_ENUM(1,"Horizontal error diffusion, reset error at line start") \ - DRI_CONF_ENUM(2,"Ordered 2D color dithering") \ - DRI_CONF_DESC_END \ -DRI_CONF_OPT_END - -#define DRI_CONF_ROUND_TRUNC 0 -#define DRI_CONF_ROUND_ROUND 1 -#define DRI_CONF_ROUND_MODE(def) \ -DRI_CONF_OPT_BEGIN_V(round_mode,enum,def,"0:1") \ - DRI_CONF_DESC_BEGIN(en,"Color rounding method") \ - DRI_CONF_ENUM(0,"Round color components downward") \ - DRI_CONF_ENUM(1,"Round to nearest color") \ - DRI_CONF_DESC_END \ -DRI_CONF_OPT_END - -#define DRI_CONF_FTHROTTLE_BUSY 0 -#define DRI_CONF_FTHROTTLE_USLEEPS 1 -#define DRI_CONF_FTHROTTLE_IRQS 2 -#define DRI_CONF_FTHROTTLE_MODE(def) \ -DRI_CONF_OPT_BEGIN_V(fthrottle_mode,enum,def,"0:2") \ - DRI_CONF_DESC_BEGIN(en,"Method to limit rendering latency") \ - DRI_CONF_ENUM(0,"Busy waiting for the graphics hardware") \ - DRI_CONF_ENUM(1,"Sleep for brief intervals while waiting for the graphics hardware") \ - DRI_CONF_ENUM(2,"Let the graphics hardware emit a software interrupt and sleep") \ - DRI_CONF_DESC_END \ -DRI_CONF_OPT_END - -#define DRI_CONF_TEXTURE_DEPTH_FB 0 -#define DRI_CONF_TEXTURE_DEPTH_32 1 -#define DRI_CONF_TEXTURE_DEPTH_16 2 -#define DRI_CONF_TEXTURE_DEPTH_FORCE_16 3 -#define DRI_CONF_TEXTURE_DEPTH(def) \ -DRI_CONF_OPT_BEGIN_V(texture_depth,enum,def,"0:3") \ - DRI_CONF_DESC_BEGIN(en,"Texture color depth") \ - DRI_CONF_ENUM(0,"Prefer frame buffer color depth") \ - DRI_CONF_ENUM(1,"Prefer 32 bits per texel") \ - DRI_CONF_ENUM(2,"Prefer 16 bits per texel") \ - DRI_CONF_ENUM(3,"Force 16 bits per texel") \ - DRI_CONF_DESC_END \ -DRI_CONF_OPT_END - -#define DRI_CONF_TCL_SW 0 -#define DRI_CONF_TCL_PIPELINED 1 -#define DRI_CONF_TCL_VTXFMT 2 -#define DRI_CONF_TCL_CODEGEN 3 typedef struct { drm_handle_t handle; /* Handle to the DRM region */ @@ -188,6 +126,7 @@ struct __DRIimageRec { #define radeon_prepare_render r200_radeon_prepare_render #define radeonUnbindContext r200_radeonUnbindContext #define radeon_update_renderbuffers r200_radeon_update_renderbuffers +#define radeon_check_front_buffer_rendering r200_radeon_check_front_buffer_rendering #define radeonCountStateEmitSize r200_radeonCountStateEmitSize #define radeon_draw_buffer r200_radeon_draw_buffer #define radeonDrawBuffer r200_radeonDrawBuffer diff --git a/lib/mesa/src/mesa/drivers/dri/r200/radeon_span.c b/lib/mesa/src/mesa/drivers/dri/r200/radeon_span.c index fa5b2d98f..42f62a0cb 100644 --- a/lib/mesa/src/mesa/drivers/dri/r200/radeon_span.c +++ b/lib/mesa/src/mesa/drivers/dri/r200/radeon_span.c @@ -44,7 +44,6 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #include "main/texformat.h" #include "main/renderbuffer.h" #include "main/samplerobj.h" -#include "main/framebuffer.h" #include "swrast/swrast.h" #include "swrast/s_renderbuffer.h" @@ -53,9 +52,7 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. static void -radeon_renderbuffer_map(struct gl_context *ctx, - struct gl_renderbuffer *rb, - bool flip_y) +radeon_renderbuffer_map(struct gl_context *ctx, struct gl_renderbuffer *rb) { struct radeon_renderbuffer *rrb = radeon_renderbuffer(rb); GLubyte *map; @@ -66,7 +63,7 @@ radeon_renderbuffer_map(struct gl_context *ctx, ctx->Driver.MapRenderbuffer(ctx, rb, 0, 0, rb->Width, rb->Height, GL_MAP_READ_BIT | GL_MAP_WRITE_BIT, - &map, &stride, flip_y); + &map, &stride); rrb->base.Map = map; rrb->base.RowStride = stride; @@ -98,11 +95,9 @@ radeon_map_framebuffer(struct gl_context *ctx, struct gl_framebuffer *fb) /* check for render to textures */ for (i = 0; i < BUFFER_COUNT; i++) - radeon_renderbuffer_map(ctx, fb->Attachment[i].Renderbuffer, - fb->FlipY); + radeon_renderbuffer_map(ctx, fb->Attachment[i].Renderbuffer); - if (_mesa_is_front_buffer_drawing(fb)) - RADEON_CONTEXT(ctx)->front_buffer_dirty = true; + radeon_check_front_buffer_rendering(ctx); } static void @@ -118,8 +113,7 @@ radeon_unmap_framebuffer(struct gl_context *ctx, struct gl_framebuffer *fb) for (i = 0; i < BUFFER_COUNT; i++) radeon_renderbuffer_unmap(ctx, fb->Attachment[i].Renderbuffer); - if (_mesa_is_front_buffer_drawing(fb)) - RADEON_CONTEXT(ctx)->front_buffer_dirty = true; + radeon_check_front_buffer_rendering(ctx); } static void radeonSpanRenderStart(struct gl_context * ctx) diff --git a/lib/mesa/src/mesa/drivers/dri/r200/radeon_texture.c b/lib/mesa/src/mesa/drivers/dri/r200/radeon_texture.c index f2d435a37..4794ddae0 100644 --- a/lib/mesa/src/mesa/drivers/dri/r200/radeon_texture.c +++ b/lib/mesa/src/mesa/drivers/dri/r200/radeon_texture.c @@ -41,7 +41,7 @@ #include "main/texobj.h" #include "drivers/common/meta.h" -#include "util/xmlpool.h" /* for symbolic values of enum-type options */ +#include "xmlpool.h" /* for symbolic values of enum-type options */ #include "radeon_common.h" diff --git a/lib/mesa/src/mesa/drivers/dri/radeon/Makefile.am b/lib/mesa/src/mesa/drivers/dri/radeon/Makefile.am index 9d43d2627..b236aa6b5 100644 --- a/lib/mesa/src/mesa/drivers/dri/radeon/Makefile.am +++ b/lib/mesa/src/mesa/drivers/dri/radeon/Makefile.am @@ -25,8 +25,7 @@ include Makefile.sources EXTRA_DIST = \ radeon_maos_verts.c \ - radeon_maos_arrays.c \ - meson.build + radeon_maos_arrays.c AM_CFLAGS = \ -DRADEON_R100 \ @@ -36,9 +35,9 @@ AM_CFLAGS = \ -I$(top_srcdir)/src/mesa/ \ -I$(top_srcdir)/src/gallium/include \ -I$(top_srcdir)/src/gallium/auxiliary \ - -I$(top_builddir)/src/util \ -I$(top_srcdir)/src/mesa/drivers/dri/common \ -I$(top_srcdir)/src/mesa/drivers/dri/radeon/server \ + -I$(top_builddir)/src/mesa/drivers/dri/common \ $(DEFINES) \ $(VISIBILITY_CFLAGS) \ $(RADEON_CFLAGS) diff --git a/lib/mesa/src/mesa/drivers/dri/swrast/Makefile.am b/lib/mesa/src/mesa/drivers/dri/swrast/Makefile.am index 110c05605..9d21d9ea4 100644 --- a/lib/mesa/src/mesa/drivers/dri/swrast/Makefile.am +++ b/lib/mesa/src/mesa/drivers/dri/swrast/Makefile.am @@ -30,13 +30,11 @@ AM_CFLAGS = \ -I$(top_srcdir)/src/mesa/ \ -I$(top_srcdir)/src/gallium/include \ -I$(top_srcdir)/src/gallium/auxiliary \ - -I$(top_builddir)/src/util \ -I$(top_srcdir)/src/mesa/drivers/dri/common \ + -I$(top_builddir)/src/mesa/drivers/dri/common \ $(LIBDRM_CFLAGS) \ $(DEFINES) \ $(VISIBILITY_CFLAGS) noinst_LTLIBRARIES = libswrast_dri.la libswrast_dri_la_SOURCES = $(SWRAST_C_FILES) - -EXTRA_DIST = meson.build diff --git a/lib/mesa/src/mesa/drivers/osmesa/Makefile.am b/lib/mesa/src/mesa/drivers/osmesa/Makefile.am index f78169959..46332e16b 100644 --- a/lib/mesa/src/mesa/drivers/osmesa/Makefile.am +++ b/lib/mesa/src/mesa/drivers/osmesa/Makefile.am @@ -21,17 +21,13 @@ # FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS # IN THE SOFTWARE. -EXTRA_DIST = osmesa.def SConscript meson.build - AM_CPPFLAGS = \ -I$(top_srcdir)/include \ -I$(top_srcdir)/src \ -I$(top_srcdir)/src/gallium/include \ -I$(top_srcdir)/src/gallium/auxiliary \ - -I$(top_builddir)/src/mapi \ -I$(top_srcdir)/src/mapi \ - -I$(top_builddir)/src/mapi/glapi \ - -I$(top_srcdir)/src/mapi/glapi \ + -I$(top_builddir)/src/mapi \ -I$(top_srcdir)/src/mesa/ \ $(DEFINES) AM_CFLAGS = $(PTHREAD_CFLAGS) \ diff --git a/lib/mesa/src/mesa/gl.pc.in b/lib/mesa/src/mesa/gl.pc.in index 680f74277..181724b97 100644 --- a/lib/mesa/src/mesa/gl.pc.in +++ b/lib/mesa/src/mesa/gl.pc.in @@ -7,7 +7,7 @@ Name: gl Description: Mesa OpenGL library Requires.private: @GL_PC_REQ_PRIV@ Version: @PACKAGE_VERSION@ -Libs: -L${libdir} -l@GL_PKGCONF_LIB@ +Libs: -L${libdir} -l@GL_LIB@ Libs.private: @GL_PC_LIB_PRIV@ Cflags: -I${includedir} @GL_PC_CFLAGS@ glx_tls: @GLX_TLS@ diff --git a/lib/mesa/src/mesa/main/format_pack.c b/lib/mesa/src/mesa/main/format_pack.c index 3430f360f..f35f96a9c 100644 --- a/lib/mesa/src/mesa/main/format_pack.c +++ b/lib/mesa/src/mesa/main/format_pack.c @@ -38,13 +38,11 @@ #include <stdint.h> -#include "config.h" -#include "errors.h" #include "format_pack.h" #include "format_utils.h" #include "macros.h" -#include "util/format_rgb9e5.h" -#include "util/format_r11g11b10f.h" +#include "../../gallium/auxiliary/util/u_format_rgb9e5.h" +#include "../../gallium/auxiliary/util/u_format_r11g11b10f.h" #include "util/format_srgb.h" #define UNPACK(SRC, OFFSET, BITS) (((SRC) >> (OFFSET)) & MAX_UINT(BITS)) @@ -454,30 +452,6 @@ pack_ubyte_a1b5g5r5_unorm(const GLubyte src[4], void *dst) } static inline void -pack_ubyte_x1b5g5r5_unorm(const GLubyte src[4], void *dst) -{ - - - - uint8_t b = - _mesa_unorm_to_unorm(src[2], 8, 5); - - - uint8_t g = - _mesa_unorm_to_unorm(src[1], 8, 5); - - - uint8_t r = - _mesa_unorm_to_unorm(src[0], 8, 5); - - uint16_t d = 0; - d |= PACK(b, 1, 5); - d |= PACK(g, 6, 5); - d |= PACK(r, 11, 5); - (*(uint16_t *)dst) = d; -} - -static inline void pack_ubyte_b5g5r5a1_unorm(const GLubyte src[4], void *dst) { @@ -1829,19 +1803,6 @@ pack_ubyte_a8l8_srgb(const GLubyte src[4], void *dst) } static inline void -pack_ubyte_r_srgb8(const GLubyte src[4], void *dst) -{ - - - uint8_t r = - - util_format_linear_to_srgb_8unorm(src[0]); - - uint8_t *d = (uint8_t *)dst; - d[0] = r; -} - -static inline void pack_ubyte_l_srgb8(const GLubyte src[4], void *dst) { @@ -3649,7 +3610,7 @@ pack_ubyte_rgbx_sint32(const GLubyte src[4], void *dst) d[1] = g; d[2] = b; } - + static inline void pack_ubyte_r9g9b9e5_float(const GLubyte src[4], void *dst) { @@ -3674,7 +3635,7 @@ pack_ubyte_r11g11b10_float(const GLubyte src[4], void *dst) /* uint packing functions */ - + static inline void pack_uint_a8b8g8r8_uint(const GLuint src[4], void *dst) { @@ -5138,7 +5099,7 @@ pack_uint_rgbx_sint32(const GLuint src[4], void *dst) d[1] = g; d[2] = b; } - + /* float packing functions */ @@ -5541,30 +5502,6 @@ pack_float_a1b5g5r5_unorm(const GLfloat src[4], void *dst) } static inline void -pack_float_x1b5g5r5_unorm(const GLfloat src[4], void *dst) -{ - - - - uint8_t b = - _mesa_float_to_unorm(src[2], 5); - - - uint8_t g = - _mesa_float_to_unorm(src[1], 5); - - - uint8_t r = - _mesa_float_to_unorm(src[0], 5); - - uint16_t d = 0; - d |= PACK(b, 1, 5); - d |= PACK(g, 6, 5); - d |= PACK(r, 11, 5); - (*(uint16_t *)dst) = d; -} - -static inline void pack_float_b5g5r5a1_unorm(const GLfloat src[4], void *dst) { @@ -6916,19 +6853,6 @@ pack_float_a8l8_srgb(const GLfloat src[4], void *dst) } static inline void -pack_float_r_srgb8(const GLfloat src[4], void *dst) -{ - - - uint8_t r = - - util_format_linear_float_to_srgb_8unorm(src[0]); - - uint8_t *d = (uint8_t *)dst; - d[0] = r; -} - -static inline void pack_float_l_srgb8(const GLfloat src[4], void *dst) { @@ -7272,7 +7196,7 @@ pack_float_rgbx_float32(const GLfloat src[4], void *dst) d[1] = g; d[2] = b; } - + static inline void pack_float_r9g9b9e5_float(const GLfloat src[4], void *dst) { @@ -7343,9 +7267,6 @@ _mesa_get_pack_ubyte_rgba_function(mesa_format format) case MESA_FORMAT_A1B5G5R5_UNORM: return pack_ubyte_a1b5g5r5_unorm; - case MESA_FORMAT_X1B5G5R5_UNORM: - return pack_ubyte_x1b5g5r5_unorm; - case MESA_FORMAT_B5G5R5A1_UNORM: return pack_ubyte_b5g5r5a1_unorm; @@ -7541,9 +7462,6 @@ _mesa_get_pack_ubyte_rgba_function(mesa_format format) case MESA_FORMAT_A8L8_SRGB: return pack_ubyte_a8l8_srgb; - case MESA_FORMAT_R_SRGB8: - return pack_ubyte_r_srgb8; - case MESA_FORMAT_L_SRGB8: return pack_ubyte_l_srgb8; @@ -7831,7 +7749,7 @@ _mesa_get_pack_ubyte_rgba_function(mesa_format format) case MESA_FORMAT_RGBX_SINT32: return pack_ubyte_rgbx_sint32; - default: + default: return NULL; } } @@ -7892,9 +7810,6 @@ _mesa_get_pack_float_rgba_function(mesa_format format) case MESA_FORMAT_A1B5G5R5_UNORM: return pack_float_a1b5g5r5_unorm; - case MESA_FORMAT_X1B5G5R5_UNORM: - return pack_float_x1b5g5r5_unorm; - case MESA_FORMAT_B5G5R5A1_UNORM: return pack_float_b5g5r5a1_unorm; @@ -8090,9 +8005,6 @@ _mesa_get_pack_float_rgba_function(mesa_format format) case MESA_FORMAT_A8L8_SRGB: return pack_float_a8l8_srgb; - case MESA_FORMAT_R_SRGB8: - return pack_float_r_srgb8; - case MESA_FORMAT_L_SRGB8: return pack_float_l_srgb8; @@ -8158,7 +8070,7 @@ _mesa_get_pack_float_rgba_function(mesa_format format) case MESA_FORMAT_RGBX_FLOAT32: return pack_float_rgbx_float32; - default: + default: return NULL; } } @@ -8287,13 +8199,6 @@ _mesa_pack_ubyte_rgba_row(mesa_format format, GLuint n, } break; - case MESA_FORMAT_X1B5G5R5_UNORM: - for (i = 0; i < n; ++i) { - pack_ubyte_x1b5g5r5_unorm(src[i], d); - d += 2; - } - break; - case MESA_FORMAT_B5G5R5A1_UNORM: for (i = 0; i < n; ++i) { pack_ubyte_b5g5r5a1_unorm(src[i], d); @@ -8749,13 +8654,6 @@ _mesa_pack_ubyte_rgba_row(mesa_format format, GLuint n, } break; - case MESA_FORMAT_R_SRGB8: - for (i = 0; i < n; ++i) { - pack_ubyte_r_srgb8(src[i], d); - d += 1; - } - break; - case MESA_FORMAT_L_SRGB8: for (i = 0; i < n; ++i) { pack_ubyte_l_srgb8(src[i], d); @@ -9427,7 +9325,7 @@ _mesa_pack_ubyte_rgba_row(mesa_format format, GLuint n, d += 16; } break; - default: + default: assert(!"Invalid format"); } } @@ -9443,7 +9341,7 @@ _mesa_pack_uint_rgba_row(mesa_format format, GLuint n, GLubyte *d = dst; switch (format) { - + case MESA_FORMAT_A8B8G8R8_UINT: for (i = 0; i < n; ++i) { pack_uint_a8b8g8r8_uint(src[i], d); @@ -9961,7 +9859,7 @@ _mesa_pack_uint_rgba_row(mesa_format format, GLuint n, d += 16; } break; - default: + default: assert(!"Invalid format"); } } @@ -10090,13 +9988,6 @@ _mesa_pack_float_rgba_row(mesa_format format, GLuint n, } break; - case MESA_FORMAT_X1B5G5R5_UNORM: - for (i = 0; i < n; ++i) { - pack_float_x1b5g5r5_unorm(src[i], d); - d += 2; - } - break; - case MESA_FORMAT_B5G5R5A1_UNORM: for (i = 0; i < n; ++i) { pack_float_b5g5r5a1_unorm(src[i], d); @@ -10552,13 +10443,6 @@ _mesa_pack_float_rgba_row(mesa_format format, GLuint n, } break; - case MESA_FORMAT_R_SRGB8: - for (i = 0; i < n; ++i) { - pack_float_r_srgb8(src[i], d); - d += 1; - } - break; - case MESA_FORMAT_L_SRGB8: for (i = 0; i < n; ++i) { pack_float_l_srgb8(src[i], d); @@ -10712,7 +10596,7 @@ _mesa_pack_float_rgba_row(mesa_format format, GLuint n, d += 16; } break; - default: + default: assert(!"Invalid format"); } } @@ -10800,10 +10684,6 @@ pack_float_Z_UNORM32(const GLfloat *src, void *dst) *d = (GLuint) (*src * scale); } -/** - ** Pack float to Z_FLOAT32 or Z_FLOAT32_X24S8. - **/ - static void pack_float_Z_FLOAT32(const GLfloat *src, void *dst) { @@ -10876,13 +10756,19 @@ pack_uint_Z_UNORM32(const GLuint *src, void *dst) *d = *src; } -/** - ** Pack uint to Z_FLOAT32 or Z_FLOAT32_X24S8. - **/ - static void pack_uint_Z_FLOAT32(const GLuint *src, void *dst) { + GLuint *d = ((GLuint *) dst); + const GLdouble scale = 1.0 / (GLdouble) 0xffffffff; + *d = (GLuint) (*src * scale); + assert(*d >= 0.0f); + assert(*d <= 1.0f); +} + +static void +pack_uint_Z_FLOAT32_X24S8(const GLuint *src, void *dst) +{ GLfloat *d = ((GLfloat *) dst); const GLdouble scale = 1.0 / (GLdouble) 0xffffffff; *d = (GLfloat) (*src * scale); @@ -10905,8 +10791,9 @@ _mesa_get_pack_uint_z_func(mesa_format format) case MESA_FORMAT_Z_UNORM32: return pack_uint_Z_UNORM32; case MESA_FORMAT_Z_FLOAT32: - case MESA_FORMAT_Z32_FLOAT_S8X24_UINT: return pack_uint_Z_FLOAT32; + case MESA_FORMAT_Z32_FLOAT_S8X24_UINT: + return pack_uint_Z_FLOAT32_X24S8; default: _mesa_problem(NULL, "unexpected format in _mesa_get_pack_uint_z_func()"); return NULL; diff --git a/lib/mesa/src/mesa/main/format_unpack.c b/lib/mesa/src/mesa/main/format_unpack.c index d3527d6e8..46befab6b 100644 --- a/lib/mesa/src/mesa/main/format_unpack.c +++ b/lib/mesa/src/mesa/main/format_unpack.c @@ -38,12 +38,11 @@ #include <stdint.h> -#include "errors.h" #include "format_unpack.h" #include "format_utils.h" #include "macros.h" -#include "util/format_rgb9e5.h" -#include "util/format_r11g11b10f.h" +#include "../../gallium/auxiliary/util/u_format_rgb9e5.h" +#include "../../gallium/auxiliary/util/u_format_r11g11b10f.h" #include "util/format_srgb.h" #define UNPACK(SRC, OFFSET, BITS) (((SRC) >> (OFFSET)) & MAX_UINT(BITS)) @@ -404,27 +403,6 @@ unpack_float_a1b5g5r5_unorm(const void *void_src, GLfloat dst[4]) } static inline void -unpack_float_x1b5g5r5_unorm(const void *void_src, GLfloat dst[4]) -{ - uint16_t *src = (uint16_t *)void_src; - uint8_t b = UNPACK(*src, 1, 5); - uint8_t g = UNPACK(*src, 6, 5); - uint8_t r = UNPACK(*src, 11, 5); - - - - dst[0] = _mesa_unorm_to_float(r, 5); - - - dst[1] = _mesa_unorm_to_float(g, 5); - - - dst[2] = _mesa_unorm_to_float(b, 5); - - dst[3] = 1.0f; -} - -static inline void unpack_float_b5g5r5a1_unorm(const void *void_src, GLfloat dst[4]) { uint16_t *src = (uint16_t *)void_src; @@ -1788,24 +1766,6 @@ unpack_float_a8l8_srgb(const void *void_src, GLfloat dst[4]) } static inline void -unpack_float_r_srgb8(const void *void_src, GLfloat dst[4]) -{ - uint8_t *src = (uint8_t *)void_src; - uint8_t r = src[0]; - - - - - dst[0] = util_format_srgb_8unorm_to_linear_float(r); - - dst[1] = 0.0f; - - dst[2] = 0.0f; - - dst[3] = 1.0f; -} - -static inline void unpack_float_l_srgb8(const void *void_src, GLfloat dst[4]) { uint8_t *src = (uint8_t *)void_src; @@ -2203,7 +2163,7 @@ unpack_float_rgbx_float32(const void *void_src, GLfloat dst[4]) dst[3] = 1.0f; } - + static void unpack_float_r9g9b9e5_float(const void *src, GLfloat dst[4]) { @@ -2622,27 +2582,6 @@ unpack_ubyte_a1b5g5r5_unorm(const void *void_src, GLubyte dst[4]) } static inline void -unpack_ubyte_x1b5g5r5_unorm(const void *void_src, GLubyte dst[4]) -{ - uint16_t *src = (uint16_t *)void_src; - uint8_t b = UNPACK(*src, 1, 5); - uint8_t g = UNPACK(*src, 6, 5); - uint8_t r = UNPACK(*src, 11, 5); - - - - dst[0] = _mesa_unorm_to_unorm(r, 5, 8); - - - dst[1] = _mesa_unorm_to_unorm(g, 5, 8); - - - dst[2] = _mesa_unorm_to_unorm(b, 5, 8); - - dst[3] = 255; -} - -static inline void unpack_ubyte_b5g5r5a1_unorm(const void *void_src, GLubyte dst[4]) { uint16_t *src = (uint16_t *)void_src; @@ -4006,24 +3945,6 @@ unpack_ubyte_a8l8_srgb(const void *void_src, GLubyte dst[4]) } static inline void -unpack_ubyte_r_srgb8(const void *void_src, GLubyte dst[4]) -{ - uint8_t *src = (uint8_t *)void_src; - uint8_t r = src[0]; - - - - - dst[0] = util_format_srgb_to_linear_8unorm(r); - - dst[1] = 0; - - dst[2] = 0; - - dst[3] = 255; -} - -static inline void unpack_ubyte_l_srgb8(const void *void_src, GLubyte dst[4]) { uint8_t *src = (uint8_t *)void_src; @@ -4065,10 +3986,10 @@ unpack_ubyte_bgr_srgb8(const void *void_src, GLubyte dst[4]) dst[3] = 255; } - + /* integer packing functions */ - + static inline void unpack_int_a8b8g8r8_uint(const void *void_src, GLuint dst[4]) { @@ -5362,7 +5283,7 @@ unpack_int_rgbx_sint32(const void *void_src, GLuint dst[4]) dst[3] = 1; } - + void _mesa_unpack_rgba_row(mesa_format format, GLuint n, @@ -5468,12 +5389,6 @@ _mesa_unpack_rgba_row(mesa_format format, GLuint n, s += 2; } break; - case MESA_FORMAT_X1B5G5R5_UNORM: - for (i = 0; i < n; ++i) { - unpack_float_x1b5g5r5_unorm(s, dst[i]); - s += 2; - } - break; case MESA_FORMAT_B5G5R5A1_UNORM: for (i = 0; i < n; ++i) { unpack_float_b5g5r5a1_unorm(s, dst[i]); @@ -5864,12 +5779,6 @@ _mesa_unpack_rgba_row(mesa_format format, GLuint n, s += 2; } break; - case MESA_FORMAT_R_SRGB8: - for (i = 0; i < n; ++i) { - unpack_float_r_srgb8(s, dst[i]); - s += 1; - } - break; case MESA_FORMAT_L_SRGB8: for (i = 0; i < n; ++i) { unpack_float_l_srgb8(s, dst[i]); @@ -6002,7 +5911,7 @@ _mesa_unpack_rgba_row(mesa_format format, GLuint n, s += 16; } break; - case MESA_FORMAT_YCBCR: + case MESA_FORMAT_YCBCR: unpack_float_ycbcr(src, dst, n); break; case MESA_FORMAT_YCBCR_REV: @@ -6136,13 +6045,6 @@ _mesa_unpack_ubyte_rgba_row(mesa_format format, GLuint n, } break; - case MESA_FORMAT_X1B5G5R5_UNORM: - for (i = 0; i < n; ++i) { - unpack_ubyte_x1b5g5r5_unorm(s, dst[i]); - s += 2; - } - break; - case MESA_FORMAT_B5G5R5A1_UNORM: for (i = 0; i < n; ++i) { unpack_ubyte_b5g5r5a1_unorm(s, dst[i]); @@ -6598,13 +6500,6 @@ _mesa_unpack_ubyte_rgba_row(mesa_format format, GLuint n, } break; - case MESA_FORMAT_R_SRGB8: - for (i = 0; i < n; ++i) { - unpack_ubyte_r_srgb8(s, dst[i]); - s += 1; - } - break; - case MESA_FORMAT_L_SRGB8: for (i = 0; i < n; ++i) { unpack_ubyte_l_srgb8(s, dst[i]); @@ -6618,7 +6513,7 @@ _mesa_unpack_ubyte_rgba_row(mesa_format format, GLuint n, s += 3; } break; - default: + default: /* get float values, convert to ubyte */ { GLfloat *tmp = malloc(n * 4 * sizeof(GLfloat)); @@ -6646,7 +6541,7 @@ _mesa_unpack_uint_rgba_row(mesa_format format, GLuint n, GLuint i; switch (format) { - + case MESA_FORMAT_A8B8G8R8_UINT: for (i = 0; i < n; ++i) { unpack_int_a8b8g8r8_uint(s, dst[i]); @@ -7164,7 +7059,7 @@ _mesa_unpack_uint_rgba_row(mesa_format format, GLuint n, s += 16; } break; - default: + default: _mesa_problem(NULL, "%s: bad format %s", __func__, _mesa_get_format_name(format)); return; diff --git a/lib/mesa/src/mesa/program/program_parse.tab.h b/lib/mesa/src/mesa/program/program_parse.tab.h index def9d6d8c..ca649d8ec 100644 --- a/lib/mesa/src/mesa/program/program_parse.tab.h +++ b/lib/mesa/src/mesa/program/program_parse.tab.h @@ -1,9 +1,8 @@ -/* A Bison parser, made by GNU Bison 3.3.2. */ +/* A Bison parser, made by GNU Bison 3.0.4. */ /* Bison interface for Yacc-like parsers in C - Copyright (C) 1984, 1989-1990, 2000-2015, 2018-2019 Free Software Foundation, - Inc. + Copyright (C) 1984, 1989-1990, 2000-2015 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -31,9 +30,6 @@ This special exception was added by the Free Software Foundation in version 2.2 of Bison. */ -/* Undocumented macros, especially those whose name start with YY_, - are private implementation details. Do not rely on them. */ - #ifndef YY__MESA_PROGRAM_PROGRAM_PROGRAM_PARSE_TAB_H_INCLUDED # define YY__MESA_PROGRAM_PROGRAM_PROGRAM_PARSE_TAB_H_INCLUDED /* Debug traces. */ @@ -144,15 +140,16 @@ extern int _mesa_program_debug; TEX_ARRAYSHADOW2D = 350, VERTEX = 351, VTXATTRIB = 352, - IDENTIFIER = 353, - USED_IDENTIFIER = 354, - MASK4 = 355, - MASK3 = 356, - MASK2 = 357, - MASK1 = 358, - SWIZZLE = 359, - DOT_DOT = 360, - DOT = 361 + WEIGHT = 353, + IDENTIFIER = 354, + USED_IDENTIFIER = 355, + MASK4 = 356, + MASK3 = 357, + MASK2 = 358, + MASK1 = 359, + SWIZZLE = 360, + DOT_DOT = 361, + DOT = 362 }; #endif @@ -161,7 +158,7 @@ extern int _mesa_program_debug; union YYSTYPE { -#line 129 "./program/program_parse.y" /* yacc.c:1921 */ +#line 126 "../../../src/mesa/program/program_parse.y" /* yacc.c:1909 */ struct asm_instruction *inst; struct asm_symbol *sym; @@ -175,7 +172,7 @@ union YYSTYPE unsigned attrib; int integer; float real; - gl_state_index16 state[STATE_LENGTH]; + gl_state_index state[STATE_LENGTH]; int negate; struct asm_vector vector; enum prog_opcode opcode; @@ -187,7 +184,7 @@ union YYSTYPE unsigned negate:1; } ext_swizzle; -#line 191 "./program/program_parse.tab.h" /* yacc.c:1921 */ +#line 188 "./program/program_parse.tab.h" /* yacc.c:1909 */ }; typedef union YYSTYPE YYSTYPE; diff --git a/lib/mesa/src/util/tests/hash_table/Makefile.am b/lib/mesa/src/util/tests/hash_table/Makefile.am index 526454cb1..04a77e30d 100644 --- a/lib/mesa/src/util/tests/hash_table/Makefile.am +++ b/lib/mesa/src/util/tests/hash_table/Makefile.am @@ -29,7 +29,6 @@ LDADD = \ $(DLOPEN_LIBS) TESTS = \ - clear \ collision \ delete_and_lookup \ delete_management \ @@ -38,11 +37,8 @@ TESTS = \ insert_many \ null_destroy \ random_entry \ - remove_key \ remove_null \ replacement \ $() check_PROGRAMS = $(TESTS) - -EXTRA_DIST = meson.build |