headers
Thomas Gstädtner | 23 May 18:55
Favicon

[PATCH] gallium/targets: pass ldflags parameter to MKLIB

Without passing the -ldflags parameter before $(LDFLAGS) in some cases
flags will be passed to MKLIB which it does not understand.
This might be -m64, -m32 or similar.

Signed-off-by: Thomas Gstädtner <thomas <at> gstaedtner.net>
---
 src/gallium/targets/Makefile.xorg |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/src/gallium/targets/Makefile.xorg b/src/gallium/targets/Makefile.xorg
index 481e3d6..21bf237 100644
--- a/src/gallium/targets/Makefile.xorg
+++ b/src/gallium/targets/Makefile.xorg
@@ -46,7 +46,7 @@ endif
 default: depend $(TOP)/$(LIB_DIR)/gallium $(LIBNAME) $(LIBNAME_STAGING)

 $(LIBNAME): $(OBJECTS) Makefile ../Makefile.xorg $(LIBS) $(DRIVER_PIPES) $(GALLIUM_AUXILIARIES)
-	$(MKLIB) -linker '$(LD)' -noprefix -o $@ $(LDFLAGS) $(OBJECTS) $(DRIVER_PIPES)
$(GALLIUM_AUXILIARIES) $(DRIVER_LINKS)
+	$(MKLIB) -linker '$(LD)' -noprefix -o $@ -ldflags '$(LDFLAGS)' $(OBJECTS) $(DRIVER_PIPES)
$(GALLIUM_AUXILIARIES) $(DRIVER_LINKS)

 depend: $(C_SOURCES) $(CPP_SOURCES) $(ASM_SOURCES) $(SYMLINKS) $(GENERATED_SOURCES)
 	rm -f depend
--

-- 
1.7.8.6

_______________________________________________
mesa-dev mailing list
mesa-dev <at> lists.freedesktop.org
(Continue reading)

Permalink | Reply | 0 comments |
headers
STEVEN WARD | 24 May 11:03
Picon
Favicon

Mesa 8.0.3 building problem

Hi all,
         I have an issue building the nouveau NVC0 3D driver from the Mesa git Repository. I am currently running Fedora 17 with a Nvidia 560 GTX with 1Gb of memory.
I pulled in the latest commits from the git repository as of the morning of 24-05-2012.

The ./configure options I use are:

./autogen.sh --prefix=/usr --bindir=/usr/bin --libdir=/usr/lib64 --includedir=/usr/include --with-dri-drivers= --with-gallium-drivers=swrast,nouveau --enable-debug --enable-texture-float --disable-asm --enable-opengl --disable-gles2 --disable-openvg --enable-texture-float --disable-asm --enable-opengl --disable-gles2 --disable-openvg --enable-dri --enable-glx --enable-xvmc --disable-va --disable-vdpau --disable-osmesa --disable-egl --disable-xorg --disable-d3d1x --disable-xa --disable-gbm --disable-xlib-glx --disable-gallium-egl --disable-gallium-gbm --disable-gallium-llvm --enable-driglx-direct --enable-glx-tls --enable-glu

The errors are here when I run make:

g++ -c -o objs-dricore/main/ff_fragment_shader.o main/ff_fragment_shader.cpp -DFEATURE_GL=1 -D_GNU_SOURCE -DPTHREADS -DDEBUG -DTEXTURE_FLOAT_ENABLED -DHAVE_POSIX_MEMALIGN -DUSE_XCB -DGLX_INDIRECT_RENDERING -DGLX_DIRECT_RENDERING -DGLX_USE_TLS -DPTHREADS -DUSE_EXTERNAL_DXTN_LIB=1 -DIN_DRI_DRIVER -DHAVE_ALIAS -I../../include -I../../src/glsl -I../../src/mesa -I../../src/mapi -I../../src/gallium/include -I../../src/gallium/auxiliary  -g -O2 -Wall -fno-strict-aliasing -fno-builtin-memcmp -g  -fPIC  -D_GNU_SOURCE -DPTHREADS -DDEBUG -DTEXTURE_FLOAT_ENABLED -DHAVE_POSIX_MEMALIGN -DUSE_XCB -DGLX_INDIRECT_RENDERING -DGLX_DIRECT_RENDERING -DGLX_USE_TLS -DPTHREADS -DUSE_EXTERNAL_DXTN_LIB=1 -DIN_DRI_DRIVER -DHAVE_ALIAS -DUSE_DRICORE
main/ff_fragment_shader.cpp: In function ‘ir_rvalue* emit_texenv(texenv_fragment_program*, GLuint)’:
main/ff_fragment_shader.cpp:951:3: warning: narrowing conversion of ‘(1 << ((int)rgb_shift))’ from ‘int’ to ‘float’ inside { } is ill-formed in C++11 [-Wnarrowing]
main/ff_fragment_shader.cpp:951:3: warning: narrowing conversion of ‘(1 << ((int)rgb_shift))’ from ‘int’ to ‘float’ inside { } is ill-formed in C++11 [-Wnarrowing]
main/ff_fragment_shader.cpp:951:3: warning: narrowing conversion of ‘(1 << ((int)rgb_shift))’ from ‘int’ to ‘float’ inside { } is ill-formed in C++11 [-Wnarrowing]
main/ff_fragment_shader.cpp:951:3: warning: narrowing conversion of ‘(1 << ((int)alpha_shift))’ from ‘int’ to ‘float’ inside { } is ill-formed in C++11 [-Wnarrowing]
g++ -c -o objs-dricore/main/shader_query.o main/shader_query.cpp -DFEATURE_GL=1 -D_GNU_SOURCE -DPTHREADS -DDEBUG -DTEXTURE_FLOAT_ENABLED -DHAVE_POSIX_MEMALIGN -DUSE_XCB -DGLX_INDIRECT_RENDERING -DGLX_DIRECT_RENDERING -DGLX_USE_TLS -DPTHREADS -DUSE_EXTERNAL_DXTN_LIB=1 -DIN_DRI_DRIVER -DHAVE_ALIAS -I../../include -I../../src/glsl -I../../src/mesa -I../../src/mapi -I../../src/gallium/include -I../../src/gallium/auxiliary  -g -O2 -Wall -fno-strict-aliasing -fno-builtin-memcmp -g  -fPIC  -D_GNU_SOURCE -DPTHREADS -DDEBUG -DTEXTURE_FLOAT_ENABLED -DHAVE_POSIX_MEMALIGN -DUSE_XCB -DGLX_INDIRECT_RENDERING -DGLX_DIRECT_RENDERING -DGLX_USE_TLS -DPTHREADS -DUSE_EXTERNAL_DXTN_LIB=1 -DIN_DRI_DRIVER -DHAVE_ALIAS -DUSE_DRICORE
g++ -c -o objs-dricore/main/uniform_query.o main/uniform_query.cpp -DFEATURE_GL=1 -D_GNU_SOURCE -DPTHREADS -DDEBUG -DTEXTURE_FLOAT_ENABLED -DHAVE_POSIX_MEMALIGN -DUSE_XCB -DGLX_INDIRECT_RENDERING -DGLX_DIRECT_RENDERING -DGLX_USE_TLS -DPTHREADS -DUSE_EXTERNAL_DXTN_LIB=1 -DIN_DRI_DRIVER -DHAVE_ALIAS -I../../include -I../../src/glsl -I../../src/mesa -I../../src/mapi -I../../src/gallium/include -I../../src/gallium/auxiliary  -g -O2 -Wall -fno-strict-aliasing -fno-builtin-memcmp -g  -fPIC  -D_GNU_SOURCE -DPTHREADS -DDEBUG -DTEXTURE_FLOAT_ENABLED -DHAVE_POSIX_MEMALIGN -DUSE_XCB -DGLX_INDIRECT_RENDERING -DGLX_DIRECT_RENDERING -DGLX_USE_TLS -DPTHREADS -DUSE_EXTERNAL_DXTN_LIB=1 -DIN_DRI_DRIVER -DHAVE_ALIAS -DUSE_DRICORE
g++ -c -o objs-dricore/program/ir_to_mesa.o program/ir_to_mesa.cpp -DFEATURE_GL=1 -D_GNU_SOURCE -DPTHREADS -DDEBUG -DTEXTURE_FLOAT_ENABLED -DHAVE_POSIX_MEMALIGN -DUSE_XCB -DGLX_INDIRECT_RENDERING -DGLX_DIRECT_RENDERING -DGLX_USE_TLS -DPTHREADS -DUSE_EXTERNAL_DXTN_LIB=1 -DIN_DRI_DRIVER -DHAVE_ALIAS -I../../include -I../../src/glsl -I../../src/mesa -I../../src/mapi -I../../src/gallium/include -I../../src/gallium/auxiliary  -g -O2 -Wall -fno-strict-aliasing -fno-builtin-memcmp -g  -fPIC  -D_GNU_SOURCE -DPTHREADS -DDEBUG -DTEXTURE_FLOAT_ENABLED -DHAVE_POSIX_MEMALIGN -DUSE_XCB -DGLX_INDIRECT_RENDERING -DGLX_DIRECT_RENDERING -DGLX_USE_TLS -DPTHREADS -DUSE_EXTERNAL_DXTN_LIB=1 -DIN_DRI_DRIVER -DHAVE_ALIAS -DUSE_DRICORE
g++ -c -o objs-dricore/program/sampler.o program/sampler.cpp -DFEATURE_GL=1 -D_GNU_SOURCE -DPTHREADS -DDEBUG -DTEXTURE_FLOAT_ENABLED -DHAVE_POSIX_MEMALIGN -DUSE_XCB -DGLX_INDIRECT_RENDERING -DGLX_DIRECT_RENDERING -DGLX_USE_TLS -DPTHREADS -DUSE_EXTERNAL_DXTN_LIB=1 -DIN_DRI_DRIVER -DHAVE_ALIAS -I../../include -I../../src/glsl -I../../src/mesa -I../../src/mapi -I../../src/gallium/include -I../../src/gallium/auxiliary  -g -O2 -Wall -fno-strict-aliasing -fno-builtin-memcmp -g  -fPIC  -D_GNU_SOURCE -DPTHREADS -DDEBUG -DTEXTURE_FLOAT_ENABLED -DHAVE_POSIX_MEMALIGN -DUSE_XCB -DGLX_INDIRECT_RENDERING -DGLX_DIRECT_RENDERING -DGLX_USE_TLS -DPTHREADS -DUSE_EXTERNAL_DXTN_LIB=1 -DIN_DRI_DRIVER -DHAVE_ALIAS -DUSE_DRICORE
g++ -c -o objs-dricore/program/string_to_uint_map.o program/string_to_uint_map.cpp -DFEATURE_GL=1 -D_GNU_SOURCE -DPTHREADS -DDEBUG -DTEXTURE_FLOAT_ENABLED -DHAVE_POSIX_MEMALIGN -DUSE_XCB -DGLX_INDIRECT_RENDERING -DGLX_DIRECT_RENDERING -DGLX_USE_TLS -DPTHREADS -DUSE_EXTERNAL_DXTN_LIB=1 -DIN_DRI_DRIVER -DHAVE_ALIAS -I../../include -I../../src/glsl -I../../src/mesa -I../../src/mapi -I../../src/gallium/include -I../../src/gallium/auxiliary  -g -O2 -Wall -fno-strict-aliasing -fno-builtin-memcmp -g  -fPIC  -D_GNU_SOURCE -DPTHREADS -DDEBUG -DTEXTURE_FLOAT_ENABLED -DHAVE_POSIX_MEMALIGN -DUSE_XCB -DGLX_INDIRECT_RENDERING -DGLX_DIRECT_RENDERING -DGLX_USE_TLS -DPTHREADS -DUSE_EXTERNAL_DXTN_LIB=1 -DIN_DRI_DRIVER -DHAVE_ALIAS -DUSE_DRICORE
mklib: Making Linux static library:  libmesa.a
mklib: Making Linux static library:  libmesagallium.a
mklib: Making Linux shared library:  ../../lib64/libdricore.so
ar: creating libmesagallium.a
ar: creating libmesa.a
mklib: Installing ../../lib64/libdricore.so in ../../lib64
mv: `../../lib64/libdricore.so' and `../../lib64/libdricore.so' are the same file
gmake[3]: Entering directory `/home/steve/mesa/src/mesa/drivers'
gmake[4]: Entering directory `/home/steve/mesa/src/mesa/drivers/dri'
gmake[5]: Entering directory `/home/steve/mesa/src/mesa/drivers/dri'
gmake[5]: Nothing to be done for `all-am'.
gmake[5]: Leaving directory `/home/steve/mesa/src/mesa/drivers/dri'
gmake[4]: Leaving directory `/home/steve/mesa/src/mesa/drivers/dri'
gmake[3]: Leaving directory `/home/steve/mesa/src/mesa/drivers'
gmake[2]: Leaving directory `/home/steve/mesa/src/mesa'
gmake[2]: Entering directory `/home/steve/mesa/src/glx'
  CCLD   libGL.la

*** Warning: Linking the shared library libGL.la against the
*** static library ../mapi/glapi/libglapi.a is not portable!
gcc: error: .libs/clientattrib.o: No such file or directory
gcc: error: .libs/clientinfo.o: No such file or directory
gcc: error: .libs/compsize.o: No such file or directory
gcc: error: .libs/create_context.o: No such file or directory
gcc: error: .libs/eval.o: No such file or directory
gcc: error: .libs/glxconfig.o: No such file or directory
gcc: error: .libs/glxcmds.o: No such file or directory
gcc: error: .libs/glxcurrent.o: No such file or directory
gcc: error: .libs/glx_error.o: No such file or directory
gcc: error: .libs/glxext.o: No such file or directory
gcc: error: .libs/glxextensions.o: No such file or directory
gcc: error: .libs/indirect_glx.o: No such file or directory
gcc: error: .libs/indirect.o: No such file or directory
gcc: error: .libs/indirect_init.o: No such file or directory
gcc: error: .libs/indirect_size.o: No such file or directory
gcc: error: .libs/indirect_window_pos.o: No such file or directory
gcc: error: .libs/indirect_texture_compression.o: No such file or directory
gcc: error: .libs/indirect_transpose_matrix.o: No such file or directory
gcc: error: .libs/indirect_vertex_array.o: No such file or directory
gcc: error: .libs/indirect_vertex_program.o: No such file or directory
gcc: error: .libs/pixel.o: No such file or directory
gcc: error: .libs/pixelstore.o: No such file or directory
gcc: error: .libs/render2.o: No such file or directory
gcc: error: .libs/renderpix.o: No such file or directory
gcc: error: .libs/single2.o: No such file or directory
gcc: error: .libs/singlepix.o: No such file or directory
gcc: error: .libs/vertarr.o: No such file or directory
gcc: error: .libs/xfont.o: No such file or directory
gcc: error: .libs/glx_pbuffer.o: No such file or directory
gcc: error: .libs/glx_query.o: No such file or directory
gcc: error: .libs/drisw_glx.o: No such file or directory
gcc: error: .libs/dri_common.o: No such file or directory
gcc: error: .libs/dri_glx.o: No such file or directory
gcc: error: .libs/XF86dri.o: No such file or directory
gcc: error: .libs/glxhash.o: No such file or directory
gcc: error: .libs/dri2_glx.o: No such file or directory
gcc: error: .libs/dri2.o: No such file or directory
gcc: error: .libs/applegl_glx.o: No such file or directory
gmake[2]: *** [libGL.la] Error 1
gmake[2]: Leaving directory `/home/steve/mesa/src/glx'
make[1]: *** [subdirs] Error 1
make[1]: Leaving directory `/home/steve/mesa/src'
make: *** [default] Error 1

Regards,
              STEVE555

_______________________________________________
mesa-dev mailing list
mesa-dev <at> lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/mesa-dev
Permalink | Reply | 0 comments |
headers
Vinson Lee | 24 May 07:44
Favicon

[PATCH] i915g: Check for geometry shader earlier in i915_set_constant_buffer.

Fix resource leak defect reported by Coverity.

Signed-off-by: Vinson Lee <vlee <at> freedesktop.org>
---
 src/gallium/drivers/i915/i915_state.c |    8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/gallium/drivers/i915/i915_state.c b/src/gallium/drivers/i915/i915_state.c
index bd9e8ba..1ff5388 100644
--- a/src/gallium/drivers/i915/i915_state.c
+++ b/src/gallium/drivers/i915/i915_state.c
@@ -672,16 +672,16 @@ static void i915_set_constant_buffer(struct pipe_context *pipe,
    unsigned new_num = 0;
    boolean diff = TRUE;

+   /* XXX don't support geom shaders now */
+   if (shader == PIPE_SHADER_GEOMETRY)
+      return;
+
    if (cb && cb->user_buffer) {
       buf = i915_user_buffer_create(pipe->screen, cb->user_buffer,
                                     cb->buffer_size,
                                     PIPE_BIND_CONSTANT_BUFFER);
    }

-   /* XXX don't support geom shaders now */
-   if (shader == PIPE_SHADER_GEOMETRY)
-      return;
-
    /* if we have a new buffer compare it with the old one */
    if (buf) {
       struct i915_buffer *ibuf = i915_buffer(buf);
--

-- 
1.7.10.1
Permalink | Reply | 1 comment |
headers
Vinson Lee | 24 May 07:07
Favicon

[PATCH] scons: Fix SCons build infrastructure for FreeBSD.

This patch gets the FreeBSD SCons build working again. The build still
fails though.

Signed-off-by: Vinson Lee <vlee <at> freedesktop.org>
---
 common.py                             |    2 +-
 src/SConscript                        |    2 +-
 src/gallium/SConscript                |    2 +-
 src/gallium/winsys/sw/xlib/SConscript |    2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/common.py b/common.py
index f0b1ccc..6121a41 100644
--- a/common.py
+++ b/common.py
@@ -89,7 +89,7 @@ def AddOptions(opts):
 	opts.Add(EnumOption('machine', 'use machine-specific assembly code', default_machine,
 											 allowed_values=('generic', 'ppc', 'x86', 'x86_64')))
 	opts.Add(EnumOption('platform', 'target platform', host_platform,
-											 allowed_values=('linux', 'windows', 'darwin', 'cygwin', 'sunos', 'freebsd8', 'haiku')))
+											 allowed_values=('cygwin', 'darwin', 'freebsd', 'haiku', 'linux', 'sunos', 'windows')))
 	opts.Add(BoolOption('embedded', 'embedded build', 'no'))
 	opts.Add('toolchain', 'compiler toolchain', default_toolchain)
 	opts.Add(BoolOption('gles', 'EXPERIMENTAL: enable OpenGL ES support', 'no'))
diff --git a/src/SConscript b/src/SConscript
index e4cda2f..3d00878 100644
--- a/src/SConscript
+++ b/src/SConscript
@@ -22,7 +22,7 @@ SConscript('mesa/SConscript')
 SConscript('mapi/vgapi/SConscript')

 if not env['embedded']:
-    if env['platform'] not in ('cygwin', 'darwin', 'haiku', 'windows'):
+    if env['platform'] not in ('cygwin', 'darwin', 'freebsd', 'haiku', 'windows'):
         SConscript('glx/SConscript')
     if env['platform'] not in ['darwin', 'haiku', 'sunos']:
         SConscript('egl/main/SConscript')
diff --git a/src/gallium/SConscript b/src/gallium/SConscript
index e212ed1..f281f4c 100644
--- a/src/gallium/SConscript
+++ b/src/gallium/SConscript
@@ -124,7 +124,7 @@ SConscript([
 ])

 if not env['embedded']:
-    if env['platform'] not in ('cygwin', 'darwin', 'haiku', 'sunos'):
+    if env['platform'] not in ('cygwin', 'darwin', 'freebsd', 'haiku', 'sunos'):
         SConscript([
             'targets/egl-static/SConscript'
         ])
diff --git a/src/gallium/winsys/sw/xlib/SConscript b/src/gallium/winsys/sw/xlib/SConscript
index e9c2740..7b1cc8c 100644
--- a/src/gallium/winsys/sw/xlib/SConscript
+++ b/src/gallium/winsys/sw/xlib/SConscript
@@ -4,7 +4,7 @@

 Import('*')

-if env['platform'] in ('cygwin', 'linux', 'sunos'):
+if env['platform'] in ('cygwin', 'freebsd', 'linux', 'sunos'):

     env = env.Clone()

--

-- 
1.7.9.6
Permalink | Reply | 1 comment |
headers
Paul Berry | 23 May 22:00
Picon
Gravatar

[PATCH] glsl/tests: Add .gitignore for uniform initialization unit test.

---
 src/glsl/tests/.gitignore |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/src/glsl/tests/.gitignore b/src/glsl/tests/.gitignore
index f3c7a7c..4f984b0 100644
--- a/src/glsl/tests/.gitignore
+++ b/src/glsl/tests/.gitignore
@@ -1 +1,2 @@
 Makefile
+uniform-initializer-test
--

-- 
1.7.7.6
Permalink | Reply | 1 comment |
headers
Eric Anholt | 23 May 21:45
Gravatar

[PATCH] mesa: Remove the generated glapi from source control, and just build it.

Mesa already always depends on python to build.  The checked in
changes are not reviewed (because any trivial change rewrites the
world).  We also have been pushing commits between xml change and
regen where at-build-time xml-generated code disagrees with committed
xml-generated code.  And worst of all, sometimes we ("I") check in
*stale* xml-generated code.
---

I dropped the giant file removals from the diff output to fit on the
mailing list.

This doesn't fix the make clean requirement in Mesa, because
makedepend appears to be just plain broken.  However, my upcoming
automake series does fix it by not using makedepend.  Modifying glapi
and typing "make", woo!

 configure.ac                    |    2 +-
 src/glx/.gitignore              |    6 +
 src/glx/indirect.c              |10736 -----------
 src/glx/indirect.h              |  722 -
 src/glx/indirect_init.c         |  789 -
 src/glx/indirect_size.c         |  382 -
 src/glx/indirect_size.h         |   85 -
 src/mapi/glapi/.gitignore       |    9 +
 src/mapi/glapi/gen/Makefile     |    3 +-
 src/mapi/glapi/glapi_gentable.c | 9530 ----------
 src/mapi/glapi/glapi_mapi_tmp.h |14139 ---------------
 src/mapi/glapi/glapi_sparc.S    | 1613 --
 src/mapi/glapi/glapi_x86-64.S   |37708 ---------------------------------------
 src/mapi/glapi/glapi_x86.S      | 1528 --
 src/mapi/glapi/glapitable.h     | 1023 --
 src/mapi/glapi/glapitemp.h      | 9742 ----------
 src/mapi/glapi/glprocs.h        | 2853 ---
 src/mesa/main/.gitignore        |    3 +
 src/mesa/main/dispatch.h        |12958 --------------
 src/mesa/main/enums.c           | 6638 -------
 src/mesa/main/remap_helper.h    | 5818 ------
 21 files changed, 21 insertions(+), 116266 deletions(-)
 delete mode 100644 src/glx/indirect.c
 delete mode 100644 src/glx/indirect.h
 delete mode 100644 src/glx/indirect_init.c
 delete mode 100644 src/glx/indirect_size.c
 delete mode 100644 src/glx/indirect_size.h
 delete mode 100644 src/mapi/glapi/glapi_gentable.c
 delete mode 100644 src/mapi/glapi/glapi_mapi_tmp.h
 delete mode 100644 src/mapi/glapi/glapi_sparc.S
 delete mode 100644 src/mapi/glapi/glapi_x86-64.S
 delete mode 100644 src/mapi/glapi/glapi_x86.S
 delete mode 100644 src/mapi/glapi/glapitable.h
 delete mode 100644 src/mapi/glapi/glapitemp.h
 delete mode 100644 src/mapi/glapi/glprocs.h
 delete mode 100644 src/mesa/main/dispatch.h
 delete mode 100644 src/mesa/main/enums.c
 delete mode 100644 src/mesa/main/remap_helper.h

diff --git a/configure.ac b/configure.ac
index 5ccf77d..ca2220f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -836,7 +836,7 @@ fi
 # build glsl and mesa if OpenGL or OpenGL ES is enabled
 case "x$enable_opengl$enable_gles1$enable_gles2" in
 x*yes*)
-    CORE_DIRS="$CORE_DIRS glsl mesa"
+    CORE_DIRS="mapi/glapi/gen $CORE_DIRS glsl mesa"
     ;;
 esac

diff --git a/src/glx/.gitignore b/src/glx/.gitignore
index 010d3f2..87c2d58 100644
--- a/src/glx/.gitignore
+++ b/src/glx/.gitignore
@@ -2,3 +2,9 @@ Makefile
 Makefile.in
 libGL.la
 libglx.la
+indirect.c
+indirect.h
+indirect_init.c
+indirect_size.c
+indirect_size.h
+
diff --git a/src/mapi/glapi/.gitignore b/src/mapi/glapi/.gitignore
index e706bc2..21edf4f 100644
--- a/src/mapi/glapi/.gitignore
+++ b/src/mapi/glapi/.gitignore
@@ -9,3 +9,12 @@ gl_XML.pyo
 gl_XML.pyc
 glX_XML.pyo
 glX_XML.pyc
+glapi_gentable.c
+glapi_gentable.h
+glapi_mapi_tmp.h
+glapi_sparc.S
+glapi_x86-64.S
+glapi_x86.S
+glapitable.h
+glapitemp.h
+glprocs.h
diff --git a/src/mapi/glapi/gen/Makefile b/src/mapi/glapi/gen/Makefile
index 49dfd75..5ca7050 100644
--- a/src/mapi/glapi/gen/Makefile
+++ b/src/mapi/glapi/gen/Makefile
@@ -121,7 +121,8 @@ COMMON_GLX = $(COMMON) glX_API.xml glX_XML.py glX_proto_common.py

 ######################################################################

-all: mesa xorg
+all: mesa
+install: mesa

 mesa: $(MESA_OUTPUTS)

diff --git a/src/mesa/main/.gitignore b/src/mesa/main/.gitignore
index d0744e3..caed74f 100644
--- a/src/mesa/main/.gitignore
+++ b/src/mesa/main/.gitignore
@@ -1,5 +1,7 @@
 api_exec_es1.c
 api_exec_es2.c
+dispatch.h
+enums.c
 get_es1.c
 get_es2.c
 git_sha1.h
@@ -8,3 +10,4 @@ api_exec_es1_dispatch.h
 api_exec_es1_remap_helper.h
 api_exec_es2_dispatch.h
 api_exec_es2_remap_helper.h
+remap_helper.h
--

-- 
1.7.10
Permalink | Reply | 3 comments |
headers
Vinson Lee | 23 May 09:04
Favicon

[PATCH v2] tgsi: Initialize Padding struct fields.

Fix uninitialized scalar variable defects report by Coverity.

Signed-off-by: Vinson Lee <vlee <at> freedesktop.org>
---
 src/gallium/auxiliary/tgsi/tgsi_build.c |    4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/gallium/auxiliary/tgsi/tgsi_build.c b/src/gallium/auxiliary/tgsi/tgsi_build.c
index 1c24b9b..cb7b9b2 100644
--- a/src/gallium/auxiliary/tgsi/tgsi_build.c
+++ b/src/gallium/auxiliary/tgsi/tgsi_build.c
@@ -109,6 +109,7 @@ tgsi_default_declaration( void )
    declaration.Semantic = 0;
    declaration.Invariant = 0;
    declaration.Local = 0;
+   declaration.Padding = 0;

    return declaration;
 }
@@ -199,6 +200,7 @@ tgsi_default_declaration_interp( void )
    di.Interpolate = TGSI_INTERPOLATE_CONSTANT;
    di.Centroid = 0;
    di.CylindricalWrap = 0;
+   di.Padding = 0;

    return di;
 }
@@ -215,6 +217,7 @@ tgsi_build_declaration_interp(unsigned interpolate,
    di.Interpolate = interpolate;
    di.Centroid = centroid;
    di.CylindricalWrap = cylindrical_wrap;
+   di.Padding = 0;

    declaration_grow(declaration, header);

@@ -262,6 +265,7 @@ tgsi_default_declaration_resource(void)
    dr.Resource = TGSI_TEXTURE_BUFFER;
    dr.Raw = 0;
    dr.Writable = 0;
+   dr.Padding = 0;

    return dr;
 }
--

-- 
1.7.10.1
Permalink | Reply | 1 comment |
headers
Vinson Lee | 23 May 08:55
Favicon

[PATCH] tgsi: Initialize Padding struct fields.

Fix uninitialized scalar variable defects report by Coverity.

Signed-off-by: Vinson Lee <vlee <at> freedesktop.org>
---
 src/gallium/auxiliary/tgsi/tgsi_build.c |    4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/gallium/auxiliary/tgsi/tgsi_build.c b/src/gallium/auxiliary/tgsi/tgsi_build.c
index 1c24b9b..00ad3dd 100644
--- a/src/gallium/auxiliary/tgsi/tgsi_build.c
+++ b/src/gallium/auxiliary/tgsi/tgsi_build.c
@@ -109,6 +109,7 @@ tgsi_default_declaration( void )
    declaration.Semantic = 0;
    declaration.Invariant = 0;
    declaration.Local = 0;
+   declaration.Padding = 0;

    return declaration;
 }
@@ -199,6 +200,7 @@ tgsi_default_declaration_interp( void )
    di.Interpolate = TGSI_INTERPOLATE_CONSTANT;
    di.Centroid = 0;
    di.CylindricalWrap = 0;
+   di.Padding = 0;

    return di;
 }
@@ -215,6 +217,7 @@ tgsi_build_declaration_interp(unsigned interpolate,
    di.Interpolate = interpolate;
    di.Centroid = centroid;
    di.CylindricalWrap = cylindrical_wrap;
+   di.CylindricalWrap = 0;

    declaration_grow(declaration, header);

@@ -262,6 +265,7 @@ tgsi_default_declaration_resource(void)
    dr.Resource = TGSI_TEXTURE_BUFFER;
    dr.Raw = 0;
    dr.Writable = 0;
+   dr.Padding = 0;

    return dr;
 }
--

-- 
1.7.10.1
Permalink | Reply | 0 comments |
headers
Tapani Pälli | 23 May 08:33
Picon
Favicon

[PATCH] mesa: update color material in GetMaterialfv

color material state gets reseted when vertices are flushed,
update state after flush. this change is written against piglit
test 'colormaterial-query'.

Signed-off-by: Tapani Pälli <tapani.palli <at> intel.com>
---
 src/mesa/main/light.c |    4 ++++
 1 files changed, 4 insertions(+), 0 deletions(-)

diff --git a/src/mesa/main/light.c b/src/mesa/main/light.c
index 38ec1b6..7b7d72c 100644
--- a/src/mesa/main/light.c
+++ b/src/mesa/main/light.c
@@ -761,6 +761,10 @@ _mesa_GetMaterialfv( GLenum face, GLenum pname, GLfloat *params )

    FLUSH_CURRENT(ctx, 0); /* update ctx->Light.Material from vertex buffer */

+   /* flush vertices resets state, update color material */
+   if(ctx->Light.ColorMaterialEnabled)
+      _mesa_update_color_material(ctx,ctx->Current.Attrib[VERT_ATTRIB_COLOR0]);
+
    if (face==GL_FRONT) {
       f = 0;
    }
--

-- 
1.7.7.6

_______________________________________________
mesa-dev mailing list
mesa-dev <at> lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/mesa-dev
Permalink | Reply | 2 comments |
headers
Ian Romanick | 22 May 23:36
Favicon

[PATCH] glsl: Remove spurious printf messages

From: Ian Romanick <ian.d.romanick <at> intel.com>

These look like debug messages from the switch-statement development.

NOTE: This is a candidate for the 8.0 release branch.

Signed-off-by: Ian Romanick <ian.d.romanick <at> intel.com>
---
 src/glsl/ast_to_hir.cpp |    3 ---
 1 files changed, 0 insertions(+), 3 deletions(-)

diff --git a/src/glsl/ast_to_hir.cpp b/src/glsl/ast_to_hir.cpp
index e23718b..15aa88e 100644
--- a/src/glsl/ast_to_hir.cpp
+++ b/src/glsl/ast_to_hir.cpp
@@ -3733,13 +3733,10 @@ ast_case_label::hir(exec_list *instructions,
       instructions->push_tail(set_fallthru_on_test);
    } else { /* default case */
       if (state->switch_state.previous_default) {
-	 printf("a\n");
 	 YYLTYPE loc = this->get_location();
 	 _mesa_glsl_error(& loc, state,
 			  "multiple default labels in one switch");

-	 printf("b\n");
-
 	 loc = state->switch_state.previous_default->get_location();
 	 _mesa_glsl_error(& loc, state,
 			  "this is the first default label");
--

-- 
1.7.6.5
Permalink | Reply | 0 comments |
headers
Tom Stellard | 22 May 19:25
Picon

r600g compute support v2

Hi,

Here is an updated version of the compute patches for r600g.  Patches 1, 9,
and 10 have been changed since v1 and patches 3 and 4 are new.

-Tom
Permalink | Reply | 16 comments |

Gmane