mesa.git
14 years agomesa: Cope with the degenerate case of zero length ranges.
José Fonseca [Sun, 3 Jan 2010 19:58:54 +0000 (19:58 +0000)]
mesa: Cope with the degenerate case of zero length ranges.

Fixes assertion failures on glean's bufferObject test.

14 years agogdi: Don't generate import libraries for opengl32.dll.
José Fonseca [Fri, 1 Jan 2010 21:54:01 +0000 (21:54 +0000)]
gdi: Don't generate import libraries for opengl32.dll.

Both MinGW and MSVC include opengl32 import libraries, and its safer to
always use those.

14 years agomesa: fix blend enable/disable calls in meta.c code
Francis Galiegue [Sun, 3 Jan 2010 16:42:17 +0000 (09:42 -0700)]
mesa: fix blend enable/disable calls in meta.c code

Fixes regression in some DRI drivers since the GL_EXT_draw_buffers2 changes.

Signed-off-by: Brian Paul <brianp@vmware.com>
14 years agoapple: Purge existing (not working) GLX_USE_APPLEGL from dated libGL on OSX
Jeremy Huddleston [Thu, 24 Dec 2009 16:47:29 +0000 (08:47 -0800)]
apple: Purge existing (not working) GLX_USE_APPLEGL from dated libGL on OSX

Signed-off-by: Jeremy Huddleston <jeremyhu@freedesktop.org>
14 years agoglxcmds: Fix comment about __DRI_ALLOCATE
Jeremy Huddleston [Thu, 24 Dec 2009 17:20:33 +0000 (09:20 -0800)]
glxcmds: Fix comment about __DRI_ALLOCATE

Signed-off-by: Jeremy Huddleston <jeremyhu@freedesktop.org>
14 years agotrace: Remove comma at end of enumerator list.
Vinson Lee [Sun, 3 Jan 2010 11:06:33 +0000 (03:06 -0800)]
trace: Remove comma at end of enumerator list.

14 years agortasm: Play nicely with Windows's Data Execution Prevention.
José Fonseca [Sun, 3 Jan 2010 11:02:12 +0000 (11:02 +0000)]
rtasm: Play nicely with Windows's Data Execution Prevention.

14 years agoprogs/vp: Ensure null-terminated byte string.
Vinson Lee [Sun, 3 Jan 2010 10:38:22 +0000 (02:38 -0800)]
progs/vp: Ensure null-terminated byte string.

14 years agoprogs/tests: Silence uninitialized variable warning.
Vinson Lee [Sun, 3 Jan 2010 05:58:40 +0000 (21:58 -0800)]
progs/tests: Silence uninitialized variable warning.

14 years agoprogs/tests: Silence warn_unused_result warning.
Vinson Lee [Sun, 3 Jan 2010 05:52:51 +0000 (21:52 -0800)]
progs/tests: Silence warn_unused_result warning.

14 years agoi810: Fix include recursion.
Vinson Lee [Sun, 3 Jan 2010 05:05:06 +0000 (21:05 -0800)]
i810: Fix include recursion.

14 years agosis: ifdef out unused variable.
Vinson Lee [Sun, 3 Jan 2010 04:47:15 +0000 (20:47 -0800)]
sis: ifdef out unused variable.

Silences GCC warning.

14 years agost/xorg: Ensure null-terminated byte string.
Vinson Lee [Sun, 3 Jan 2010 04:39:04 +0000 (20:39 -0800)]
st/xorg: Ensure null-terminated byte string.

14 years agor300g: Use C-style comments.
Vinson Lee [Sun, 3 Jan 2010 04:17:43 +0000 (20:17 -0800)]
r300g: Use C-style comments.

14 years agoglu/sgi: Initialize members of struct O_curve.
Vinson Lee [Sun, 3 Jan 2010 04:04:00 +0000 (20:04 -0800)]
glu/sgi: Initialize members of struct O_curve.

14 years agosvga: Use a shader id as low as possible.
José Fonseca [Sun, 3 Jan 2010 00:47:30 +0000 (00:47 +0000)]
svga: Use a shader id as low as possible.

14 years agoutil: Minor enhancements/corrections to the bitmask logic.
José Fonseca [Sun, 3 Jan 2010 00:41:01 +0000 (00:41 +0000)]
util: Minor enhancements/corrections to the bitmask logic.

14 years agosvga: Rename error labels.
José Fonseca [Sat, 2 Jan 2010 21:46:42 +0000 (21:46 +0000)]
svga: Rename error labels.

Make it easier to insert/remove error branches.

14 years agoglu/sgi: Initialize members of struct O_surface.
Vinson Lee [Sat, 2 Jan 2010 23:46:11 +0000 (15:46 -0800)]
glu/sgi: Initialize members of struct O_surface.

14 years agoglu/sgi: Initialize member of struct O_trim.
Vinson Lee [Sat, 2 Jan 2010 23:29:25 +0000 (15:29 -0800)]
glu/sgi: Initialize member of struct O_trim.

14 years agogallium: Hunt down all references to GALLIUM_AUXILIARY_DIRS.
José Fonseca [Sat, 2 Jan 2010 20:22:52 +0000 (20:22 +0000)]
gallium: Hunt down all references to GALLIUM_AUXILIARY_DIRS.

14 years agoautoconf: fix build breakage
Marc Dietrich [Sat, 2 Jan 2010 12:51:17 +0000 (13:51 +0100)]
autoconf: fix build breakage

14 years agomesa: added _mesa_GetBufferParameteri64v()
Brian Paul [Sat, 2 Jan 2010 00:50:02 +0000 (17:50 -0700)]
mesa: added _mesa_GetBufferParameteri64v()

This is a new function in GL 3.2.  No dispatch for this function yet.

14 years agoglu/sgi: Initialize member of struct Property.
Vinson Lee [Sat, 2 Jan 2010 07:01:03 +0000 (23:01 -0800)]
glu/sgi: Initialize member of struct Property.

14 years agoprogs/samples: 'Silence no previous prototype' warnings.
Vinson Lee [Sat, 2 Jan 2010 01:54:11 +0000 (17:54 -0800)]
progs/samples: 'Silence no previous prototype' warnings.

14 years agoglu/sgi: Initialize member of struct Dlnode.
Vinson Lee [Sat, 2 Jan 2010 01:25:16 +0000 (17:25 -0800)]
glu/sgi: Initialize member of struct Dlnode.

14 years agoglu/sgi: Initialize members of struct O_nurbscurve.
Vinson Lee [Sat, 2 Jan 2010 01:19:27 +0000 (17:19 -0800)]
glu/sgi: Initialize members of struct O_nurbscurve.

14 years agoscons: Build glew on all platforms.
José Fonseca [Sat, 2 Jan 2010 01:12:35 +0000 (01:12 +0000)]
scons: Build glew on all platforms.

It is required for progs.

14 years agox86: Silence printf format warnings.
Vinson Lee [Sat, 2 Jan 2010 01:06:16 +0000 (17:06 -0800)]
x86: Silence printf format warnings.

14 years agoscons: Update the MSVC SA to match latest scons code.
José Fonseca [Sat, 2 Jan 2010 00:56:01 +0000 (00:56 +0000)]
scons: Update the MSVC SA to match latest scons code.

14 years agoscons: Axe generic.py.
José Fonseca [Sat, 2 Jan 2010 00:55:29 +0000 (00:55 +0000)]
scons: Axe generic.py.

Progs are now built together with the rest so no longer needed.

14 years agoprogs/rbug: s/wait/rbug_wait/
Vinson Lee [Sat, 2 Jan 2010 00:25:37 +0000 (16:25 -0800)]
progs/rbug: s/wait/rbug_wait/

wait conflicts with wait in /usr/include/sys/wait.h.

14 years agollvmpipe: Silence uninitialized variable warning.
Vinson Lee [Sat, 2 Jan 2010 00:03:53 +0000 (16:03 -0800)]
llvmpipe: Silence uninitialized variable warning.

14 years agoscons: Put glut and glew shared libraries into build/xxx/bin or lib.
José Fonseca [Fri, 1 Jan 2010 22:35:28 +0000 (22:35 +0000)]
scons: Put glut and glew shared libraries into build/xxx/bin or lib.

Use bin subdir for windows dlls, lib for unices.

14 years agopython: Don't generate a import library for python module either.
José Fonseca [Fri, 1 Jan 2010 22:03:07 +0000 (22:03 +0000)]
python: Don't generate a import library for python module either.

14 years agoi965: Add missing include.
José Fonseca [Fri, 1 Jan 2010 21:58:21 +0000 (21:58 +0000)]
i965: Add missing include.

14 years agoscons: Remove duplicated code.
José Fonseca [Fri, 1 Jan 2010 21:55:08 +0000 (21:55 +0000)]
scons: Remove duplicated code.

14 years agoscons: Disable version symlinking for DLLs.
José Fonseca [Fri, 1 Jan 2010 21:54:51 +0000 (21:54 +0000)]
scons: Disable version symlinking for DLLs.

Fixes windows build.

14 years agogdi: Don't generate import libraries for opengl32.dll.
José Fonseca [Fri, 1 Jan 2010 21:54:01 +0000 (21:54 +0000)]
gdi: Don't generate import libraries for opengl32.dll.

Both MinGW and MSVC include opengl32 import libraries, and its safer to
always use those.

14 years agoscons: Fix glew build on MSVC.
José Fonseca [Fri, 1 Jan 2010 19:58:39 +0000 (19:58 +0000)]
scons: Fix glew build on MSVC.

The environment for building the DLL needs to be quite different from
the environment for building the programs, in order to get
the dllexport/dllimport attribute done currectly. I don't know how MinGW
managed to build the programs, but MS linker refuses to link symbols with
mismatching attributes.

14 years agoutil: Silent potential loss of precision warnings.
José Fonseca [Fri, 1 Jan 2010 19:39:09 +0000 (19:39 +0000)]
util: Silent potential loss of precision warnings.

Also ensure multiplication doesn't happen for negative numbers.

14 years agollvmpipe: Use C-style comment.
Vinson Lee [Fri, 1 Jan 2010 23:38:19 +0000 (15:38 -0800)]
llvmpipe: Use C-style comment.

14 years agogallium/util: Silence format warnings.
Vinson Lee [Fri, 1 Jan 2010 23:32:52 +0000 (15:32 -0800)]
gallium/util: Silence format warnings.

14 years agoARB prog parser: Silence unused variable warnings.
Vinson Lee [Fri, 1 Jan 2010 23:12:58 +0000 (15:12 -0800)]
ARB prog parser: Silence unused variable warnings.

14 years agogallium/util: Replace h_addr with h_addr_list[0].
Vinson Lee [Fri, 1 Jan 2010 23:01:22 +0000 (15:01 -0800)]
gallium/util: Replace h_addr with h_addr_list[0].

Fixes compilation error on Mac OS.

14 years agoglu/sgi: Initialize members of class Knotvector.
Vinson Lee [Fri, 1 Jan 2010 22:46:11 +0000 (14:46 -0800)]
glu/sgi: Initialize members of class Knotvector.

14 years agoglu/sgi: Initialize member of struct Property.
Vinson Lee [Fri, 1 Jan 2010 22:39:16 +0000 (14:39 -0800)]
glu/sgi: Initialize member of struct Property.

14 years agotgsi: Add missing semantic name in text parser.
Igor Oliveira [Fri, 1 Jan 2010 18:03:27 +0000 (19:03 +0100)]
tgsi: Add missing semantic name in text parser.

14 years agor300: Fix scons build.
José Fonseca [Fri, 1 Jan 2010 00:35:43 +0000 (00:35 +0000)]
r300: Fix scons build.

14 years agoscons: Don't list cell as a driver.
José Fonseca [Fri, 1 Jan 2010 00:22:48 +0000 (00:22 +0000)]
scons: Don't list cell as a driver.

Cell driver's SConscript never got written, and it is not trivial one to
write, so don't accept cell in the driver option to avoid confusion.

14 years agollvmpipe: Add missing include path.
José Fonseca [Fri, 1 Jan 2010 00:20:52 +0000 (00:20 +0000)]
llvmpipe: Add missing include path.

The abscense was being masked previously.

14 years agogallium: Generate a single library for auxiliaries with Make too.
José Fonseca [Thu, 31 Dec 2009 23:46:46 +0000 (23:46 +0000)]
gallium: Generate a single library for auxiliaries with Make too.

14 years agoscons: Aggregate all tiny libraries in a single library.
José Fonseca [Thu, 31 Dec 2009 22:18:17 +0000 (22:18 +0000)]
scons: Aggregate all tiny libraries in a single library.

Makes integration of gallium into out of tree components much easier. No
pratical change for components in this tree,

14 years agogallium: Remove the sct module.
José Fonseca [Thu, 31 Dec 2009 21:41:24 +0000 (21:41 +0000)]
gallium: Remove the sct module.

Not used, and its functionality is now addressed by
pipe_context::is_texture/buffer_referenced callbacks.

14 years agoscons: Build progs together with everything else.
José Fonseca [Thu, 31 Dec 2009 21:10:25 +0000 (21:10 +0000)]
scons: Build progs together with everything else.

This is a substantial reorganization, This particular commit enables:
- building the progs for unices platforms
- glew is now built as a shared library (it is the default, and it is
inconvenient and pointless to shift away from that default)
- all progs get built by default

14 years agoprogs: Ignore derived files.
José Fonseca [Thu, 31 Dec 2009 20:55:33 +0000 (20:55 +0000)]
progs: Ignore derived files.

14 years agoglsl: Ignore programs.
José Fonseca [Thu, 31 Dec 2009 20:52:06 +0000 (20:52 +0000)]
glsl: Ignore programs.

14 years agoscons: Don't globally define WIN32_LEAN_AND_MEAN.
José Fonseca [Thu, 31 Dec 2009 20:19:18 +0000 (20:19 +0000)]
scons: Don't globally define WIN32_LEAN_AND_MEAN.

Some of the demo progams legitimately need the functionality
that's disabled by WIN32_LEAN_AND_MEAN.

Instead the solution should be to define WIN32_LEAN_AND_MEAN just before
including windows.h on a case by case basis.

14 years agomesa: Avoid WIN32_LEAN_AND_MEAN re-definition.
José Fonseca [Thu, 31 Dec 2009 20:14:30 +0000 (20:14 +0000)]
mesa: Avoid WIN32_LEAN_AND_MEAN re-definition.

14 years agomesa: Make condrender.[ch] prototypes match.
José Fonseca [Fri, 1 Jan 2010 11:20:38 +0000 (11:20 +0000)]
mesa: Make condrender.[ch] prototypes match.

GLAPI on windows is more than "extern" -- it includes the --, so the
mismatch between condrender.[ch] prototypes causes "different linkage"
errors on windows.

14 years agoscons: Expose convienience libraries to the host environment.
José Fonseca [Thu, 31 Dec 2009 17:58:56 +0000 (17:58 +0000)]
scons: Expose convienience libraries to the host environment.

This fixes MinGW cross compilation build, recently broken due to the use
of convenience libraries in the GLSL preprocessor.

14 years agoglut: Silent the glut*_ATEXIT_HACK defined but not used warnings.
José Fonseca [Thu, 31 Dec 2009 17:53:23 +0000 (17:53 +0000)]
glut: Silent the glut*_ATEXIT_HACK defined but not used warnings.

There are two ways to silent this: put inline keyword, or reimplement the
hack as a #define. inline keyword actually varies slightly with compiler
so I've opted by the latter.

14 years agost/mesa: implement conditional rendering
Brian Paul [Thu, 31 Dec 2009 21:47:21 +0000 (14:47 -0700)]
st/mesa: implement conditional rendering

14 years agost/mesa: move st_query_object type to header to make it public
Brian Paul [Thu, 31 Dec 2009 21:46:57 +0000 (14:46 -0700)]
st/mesa: move st_query_object type to header to make it public

14 years agosoftpipe: implement conditional rendering
Brian Paul [Thu, 31 Dec 2009 21:46:15 +0000 (14:46 -0700)]
softpipe: implement conditional rendering

14 years agogallium: pipe_context::render_condition() and mode flags
Brian Paul [Thu, 31 Dec 2009 21:44:40 +0000 (14:44 -0700)]
gallium: pipe_context::render_condition() and mode flags

For conditional rendering predicated on results of an occlusion query.

If this driver function is NULL, conditional rendering is not supported by
the driver.

14 years agonv50: small fix for handling "dangerous" swizzles
Christoph Bumiller [Thu, 31 Dec 2009 21:24:13 +0000 (22:24 +0100)]
nv50: small fix for handling "dangerous" swizzles

14 years agoMerge branch 'mesa_7_7_branch'
Brian Paul [Thu, 31 Dec 2009 16:02:27 +0000 (09:02 -0700)]
Merge branch 'mesa_7_7_branch'

Conflicts:
configs/darwin
src/gallium/auxiliary/util/u_clear.h
src/gallium/state_trackers/xorg/xorg_exa_tgsi.c
src/mesa/drivers/dri/i965/brw_draw_upload.c

14 years agomesa: remove a line of dead code
Brian Paul [Thu, 31 Dec 2009 15:50:26 +0000 (08:50 -0700)]
mesa: remove a line of dead code

14 years agodocs: 7.8 relnotes: GL_NV_conditional_render and GL_EXT_draw_buffers2
Brian Paul [Thu, 31 Dec 2009 15:48:52 +0000 (08:48 -0700)]
docs: 7.8 relnotes: GL_NV_conditional_render and GL_EXT_draw_buffers2

14 years agomesa: enable ColorMaskIndexed in display lists
Brian Paul [Thu, 31 Dec 2009 15:48:27 +0000 (08:48 -0700)]
mesa: enable ColorMaskIndexed in display lists

14 years agoprogs/tests: added test for GL_EXT_draw_buffers2
Brian Paul [Thu, 31 Dec 2009 15:46:36 +0000 (08:46 -0700)]
progs/tests: added test for GL_EXT_draw_buffers2

Render into two color buffers (render targets).  Display half of each
buffer in the window.  Use different color masks for each render target.
Only enable blending for the second render target.

14 years agomesa: enable GL_EXT_draw_buffers2 for sw drivers
Brian Paul [Thu, 31 Dec 2009 15:46:09 +0000 (08:46 -0700)]
mesa: enable GL_EXT_draw_buffers2 for sw drivers

14 years agodocs: update status for conditional rendering
Brian Paul [Thu, 31 Dec 2009 04:42:12 +0000 (21:42 -0700)]
docs: update status for conditional rendering

14 years agoprogs/tests: added conditional rendering test program
Brian Paul [Thu, 31 Dec 2009 04:41:37 +0000 (21:41 -0700)]
progs/tests: added conditional rendering test program

14 years agomesa: turn on NV_conditional_render for software drivers
Brian Paul [Thu, 31 Dec 2009 04:40:54 +0000 (21:40 -0700)]
mesa: turn on NV_conditional_render for software drivers

14 years agoswrast: add check for conditional rendering
Brian Paul [Thu, 31 Dec 2009 04:40:12 +0000 (21:40 -0700)]
swrast: add check for conditional rendering

14 years agotnl: add check for conditional rendering
Brian Paul [Thu, 31 Dec 2009 04:40:03 +0000 (21:40 -0700)]
tnl: add check for conditional rendering

14 years agomesa: plug in API functions for conditional rendering
Brian Paul [Thu, 31 Dec 2009 04:39:46 +0000 (21:39 -0700)]
mesa: plug in API functions for conditional rendering

14 years agomesa: added dispatch for GL_NV_conditional_render extension
Brian Paul [Thu, 31 Dec 2009 04:38:58 +0000 (21:38 -0700)]
mesa: added dispatch for GL_NV_conditional_render extension

14 years agomesa: added FLUSH_VERTICES(), more comments
Brian Paul [Thu, 31 Dec 2009 04:37:54 +0000 (21:37 -0700)]
mesa: added FLUSH_VERTICES(), more comments

14 years agomesa: add flag for GL_NV_conditional_render extension
Brian Paul [Wed, 30 Dec 2009 21:49:49 +0000 (14:49 -0700)]
mesa: add flag for GL_NV_conditional_render extension

14 years agomesa: _mesa_Begin/EndConditionalRender() functions
Brian Paul [Wed, 30 Dec 2009 21:47:06 +0000 (14:47 -0700)]
mesa: _mesa_Begin/EndConditionalRender() functions

For GL_NV_conditional_render and GL3.

The drawing functions don't check the query object yet.
No API dispatch yet.

14 years agomesa: make _mesa_lookup_query_object() an non-private inline function
Brian Paul [Wed, 30 Dec 2009 21:42:14 +0000 (14:42 -0700)]
mesa: make _mesa_lookup_query_object() an non-private inline function

14 years agoswrast: use different temp array in _swrast_get_dest_rgba()
Brian Paul [Thu, 31 Dec 2009 15:44:24 +0000 (08:44 -0700)]
swrast: use different temp array in _swrast_get_dest_rgba()

When using multiple color drawbuffers with blending/logicop/masking we
were overwriting color values which we still needed.

14 years agonv50: fix TEXLOD sequence and use it only in FPs
Christoph Bumiller [Thu, 31 Dec 2009 12:38:53 +0000 (13:38 +0100)]
nv50: fix TEXLOD sequence and use it only in FPs

14 years agonv50: cannot kill branch if immediate is used
Christoph Bumiller [Wed, 30 Dec 2009 20:25:13 +0000 (21:25 +0100)]
nv50: cannot kill branch if immediate is used

The immediate's bits eat the condition bits.

14 years agonv50: make assimilate_temp safe
Christoph Bumiller [Wed, 30 Dec 2009 20:17:31 +0000 (21:17 +0100)]
nv50: make assimilate_temp safe

Cannot change hw reg assigned to a TGSI TEMP on the fly if
we are in a loop, conditional, or can jump around wildly.

14 years agonv50: handle TGSI_OPCODE_EXP,LOG
Christoph Bumiller [Wed, 30 Dec 2009 19:54:58 +0000 (20:54 +0100)]
nv50: handle TGSI_OPCODE_EXP,LOG

Not that they make much sense on nv50, but we also do LIT ...

14 years agonv50: add support for subroutines
Christoph Bumiller [Thu, 31 Dec 2009 11:26:14 +0000 (12:26 +0100)]
nv50: add support for subroutines

14 years agonv50: alloc_reg on reg_instance
Christoph Bumiller [Wed, 30 Dec 2009 23:37:47 +0000 (00:37 +0100)]
nv50: alloc_reg on reg_instance

If we create multiple instances of an nv50_reg referencing
them same resource, register allocation from alloc_reg has
to be done with the original nv50_reg.

14 years agonv50: multiply polygon offset units by 2
Christoph Bumiller [Tue, 29 Dec 2009 11:04:34 +0000 (12:04 +0100)]
nv50: multiply polygon offset units by 2

14 years agonv50: neg and abs modifiers for flops
Christoph Bumiller [Mon, 28 Dec 2009 23:02:45 +0000 (00:02 +0100)]
nv50: neg and abs modifiers for flops

Also fixes RSQ of negative sources.

14 years agonv50: don't negate immediates in set_immd
Christoph Bumiller [Mon, 28 Dec 2009 22:17:26 +0000 (23:17 +0100)]
nv50: don't negate immediates in set_immd

This negation would only be triggered in situations
where it's incorrect.
The caller of set_immd should negate the immediate value
in the instruction itself if desired, and will also know
if it's a float or an int.

ADD TEMP[0], CONST[0], -IMMD[0] would load the immediate
into extra TEMP, negated, and set the negate flag in add
as well - double negation.

14 years agomesa: Silence unused variable warning.
Vinson Lee [Thu, 31 Dec 2009 08:07:47 +0000 (00:07 -0800)]
mesa: Silence unused variable warning.

14 years agoprogs/glsl: Provide a better fix for fgets warning.
Vinson Lee [Wed, 30 Dec 2009 20:38:21 +0000 (12:38 -0800)]
progs/glsl: Provide a better fix for fgets warning.

14 years agodocs: added GL 3.x feature checklist to track what's done in Mesa
Brian Paul [Wed, 30 Dec 2009 17:39:20 +0000 (10:39 -0700)]
docs: added GL 3.x feature checklist to track what's done in Mesa

14 years agomesa: implement _mesa_GetStringi() for GL3
Brian Paul [Wed, 30 Dec 2009 17:30:16 +0000 (10:30 -0700)]
mesa: implement _mesa_GetStringi() for GL3

Note: not plugged into the dispatch table yet.

14 years agomesa: _mesa_get_enabled_extension() function
Brian Paul [Wed, 30 Dec 2009 17:29:53 +0000 (10:29 -0700)]
mesa: _mesa_get_enabled_extension() function

14 years agomesa: implement GL3 GL_NUM_EXTENSIONS query
Brian Paul [Wed, 30 Dec 2009 17:16:01 +0000 (10:16 -0700)]
mesa: implement GL3 GL_NUM_EXTENSIONS query