652901e95b
Merge branch 'draw-instanced'
...
Conflicts:
src/gallium/auxiliary/draw/draw_llvm.c
src/gallium/drivers/llvmpipe/lp_state_fs.c
src/glsl/ir_set_program_inouts.cpp
src/mesa/tnl/t_vb_program.c
2011-01-15 10:24:08 -07:00
21001d2ba7
nvc0: try to swap immediates to first source too
2011-01-15 14:14:55 +01:00
52474d4246
nvc0: make sure all sources of the BIND op are distinct
...
They're supposed to be assigned consecutive registers so they can't
contain the same SSA value more than once.
2011-01-15 14:14:50 +01:00
1ae982adfd
nvc0: update user vbufs on each draw call
...
This is required in case set_vertex_buffers is not called again.
2011-01-15 12:18:52 +01:00
b50d02e2e0
nvc0: enable early fragment tests where possible
2011-01-15 12:17:57 +01:00
5ec66c6e70
nvc0: upload small buffers through the command buffer
2011-01-15 12:17:00 +01:00
a4a5a9a5ce
mesa: Add glDepthRangef and glClearDepthf to APIspec.xml.
...
Core mesa has gained support for GL_ARB_ES2_compatibility. Make GLES
generated dispatch table use them.
2011-01-15 12:42:59 +08:00
b70d0a6a51
targets/egl-static: Assorted cleanups and fixes.
...
Share more code between windows and non-windows platforms. Check
env['x11'] for X11 and add env['X11_LIBS'] to LIBS. Add ws_wrapper for
i965g.
2011-01-15 12:35:22 +08:00
6f769a690b
targets/egl: i965 needs libwsw.
...
Fix undefined symbol wrapper_sw_winsys_dewrap_pipe_screen.
2011-01-15 12:35:19 +08:00
4620de7eea
mesa: Add getter for GL_SHADER_COMPILER with ARB_ES2_compatibility.
...
Fixes piglit arb_es2_compatibility-shadercompiler
2011-01-14 16:55:35 -08:00
8395f206a8
mesa: Add getters for ARB_ES2_compatibility MAX_*_VECTORS.
...
Fixes piglit arb_es2_compatibility-maxvectors.
2011-01-14 16:55:35 -08:00
e12c4faf7e
mesa: Add support for glDepthRangef and glClearDepthf.
...
These are ARB_ES2_compatibility float variants of the core double
entrypoints. Fixes arb_es2_compatibility-depthrangef.
2011-01-14 16:55:35 -08:00
25beab10cd
ir_to_mesa: Fix segfaults on ir_to_mesa invocation after MSVC change.
2011-01-14 16:55:35 -08:00
d42acef139
glsl: fix implicit int to bool warning
...
Maybe preprocess() should return a bool.
2011-01-14 17:46:47 -07:00
7ff89b030f
docs: skeleton file for 7.11 release notes, add missing links
2011-01-14 17:46:38 -07:00
7772a34f3a
mesa: Dynamically allocate acp array in ir_to_mesa_visitor::copy_propagate.
...
Fixes these MSVC errors.
ir_to_mesa.cpp(2644) : error C2057: expected constant expression
ir_to_mesa.cpp(2644) : error C2466: cannot allocate an array of constant size 0
ir_to_mesa.cpp(2644) : error C2133: 'acp' : unknown size
ir_to_mesa.cpp(2646) : error C2070: 'ir_to_mesa_instruction *[]': illegal sizeof operand
ir_to_mesa.cpp(2709) : error C2070: 'ir_to_mesa_instruction *[]': illegal sizeof operand
ir_to_mesa.cpp(2718) : error C2070: 'ir_to_mesa_instruction *[]': illegal sizeof operand
2011-01-14 16:18:52 -08:00
7b987578a9
mesa: Add actual support for glReleaseShaderCompiler from ES2.
...
Fixes no-op dispatch warning in piglit
arb_es2_compatibility-releaseshadercompiler.c.
2011-01-14 15:30:04 -08:00
ed93f9f3a3
intel: Expose GL_ARB_ES2_compatibility.
...
We don't have all of the features of this extension hooked up yet, but
the consensus yesterday was that since those features are things that
we should also be supporting in our ES2 implementation, claiming ES2
here too doesn't make anything worse and will make incremental
improvement through piglit easier.
2011-01-14 15:30:01 -08:00
9c6954fc9d
mesa: Add extension enable bit for GL_ARB_ES2_compatibility.
2011-01-14 15:28:50 -08:00
841ad6bfad
glapi: Regenerate for GL_ARB_ES2_compatibility.
2011-01-14 15:28:01 -08:00
8560cb939b
glapi: Add entrypoints and enums for GL_ARB_ES2_compatibility.
2011-01-14 15:28:00 -08:00
634dece281
r600g: compiler helper opcode fixes for evergreen
...
Signed-off-by: Alex Deucher <alexdeucher@gmail.com>
2011-01-14 17:50:49 -05:00
9dfc68314d
r600g: pass r600_bc to some addition compiler helper functions
...
needed for asic specific opcodes
Signed-off-by: Alex Deucher <alexdeucher@gmail.com>
2011-01-14 17:50:29 -05:00
57ef69dd88
generate_builtins.py: Whitespace fixes.
...
Also removed unnecessary semicolons.
2011-01-14 14:19:02 -08:00
0de6d7e991
generate_builtins.py: Fix builds using Python 2.5.
2011-01-14 14:17:03 -08:00
a6e4614ca1
i965: Replace broken handling of dead code with an assert.
...
This code should never have been triggered, but I often did anyway
when I disabled optimization passes during debugging, then spent my
time debugging that this code doesn't work.
2011-01-14 13:57:15 -08:00
7c7df146b5
i965: Add an invalidation of live intervals after register splitting.
...
No effect, since it was called before live intervals were calculated.
2011-01-14 13:57:15 -08:00
65c41d55a0
mesa: Simplify _mesa_base_fbo_format by making it exceptions to teximages.
...
The comment of "this is just like teximages except for..." is a pretty
good clue that we're handling this wrong. By just using the teximage
code, we catch a bunch of cases we'd missed, like GL_RED and GL_RG.
2011-01-14 13:57:15 -08:00
34a9da4eb4
mesa: Add channel-wise copy propagation to ir_to_mesa.
...
This catches more opportunities than the prog_optimize.c code on
openarena's fixed function shaders turned to GLSL, mostly due to
looking at multiple source instructions for copy propagation
opportunities. It should also be much more CPU efficient than
prog_optimize.c's code.
2011-01-14 13:57:14 -08:00
d53c8380bf
i915: Fix compiler warning from sw fallback removal change.
2011-01-14 13:57:14 -08:00
4c6d6dd8fc
r600g: Disable V_SQ_ALU_WORD1_OP2_SQ_OP2_INST_FLT_TO_INT_FLOOR case.
...
The usage of macro V_SQ_ALU_WORD1_OP2_SQ_OP2_INST_FLT_TO_INT_FLOOR was
introduced by commit 323ef3a1f0
2011-01-14 13:47:37 -08:00
6e9b0f6807
gles2: Also support GL_BGRA_EXT for glTexSubImage2d
2011-01-14 16:12:21 -05:00
323ef3a1f0
r600g: add more missing instructions to r600_bc_get_num_operands
2011-01-14 18:46:52 +01:00
e7d8f92570
egl: Fix EGL_VERSION string.
...
Fix a copy-and-paste error in a4a38dcf61
2011-01-14 14:29:19 +08:00
36a59b29ef
egl: Fix an assertion in _eglUpdateAPIsString.
...
dpy->ClientAPIs was renamed in a4a38dcf61
2011-01-14 14:12:42 +08:00
483de8ef2e
i965: fix fbo-srgb on i965.
...
Until we get the EXT_framebuffer_sRGB extension we should bind the sRGB
formats for FBO as linear.
Signed-off-by: Dave Airlie <airlied@redhat.com>
2011-01-14 14:58:47 +10:00
7f652fc523
srgb: fix fbo base format picking.
...
Pointed out by Brian.
2011-01-14 14:58:47 +10:00
7b9dc40b0d
i915: Disable extension OES_standard_derivatives
...
OES_standard_derivatives must be manually disabled for i915 because Mesa
enables it by default.
2011-01-13 17:26:28 -08:00
78838b2d1b
mesa: Change OES_standard_derivatives to be stand-alone extension
...
Add a bit in struct gl_extensions for OES_standard_derivatives, and enable
the bit by default. Advertise the extension only if the bit is enabled.
Previously, OES_standard_derivatives was advertised in GLES2 contexts
if ARB_framebuffer_object was enabled.
2011-01-13 17:26:28 -08:00
a2ab929ab2
r600g: Move declaration before code in r600_asm.c.
...
Fixes SCons build.
2011-01-13 14:17:01 -08:00
96f8f8db7b
r600g: rework literal handling
2011-01-13 23:01:35 +01:00
d7342f6a81
r600g: merge alu groups
2011-01-13 23:01:35 +01:00
eea1d8199b
r600g: implement replacing gpr with pv and ps
2011-01-13 23:01:35 +01:00
4bcff0c190
glsl: Emit errors or warnings when 'layout' is used with 'attribute' or 'varying'
...
The specs that add 'layout' require the use of 'in' or 'out'.
However, a number of implementations, including Mesa, shipped several
of these extensions allowing the use of 'varying' and 'attribute'.
For these extensions only a warning is emitted.
This differs from the behavior of Mesa 7.10. Mesa 7.10 would only
accept 'attribute' with 'layout(location)'. This behavior was clearly
wrong. Rather than carrying the broken behavior forward, we're just
doing the correct thing.
This is related to (piglit) bugzilla #31804 .
NOTE: This is a candidate for the 7.9 and 7.10 branches.
2011-01-13 13:38:50 -08:00
82c4b4f88a
glsl: Allow 'in' and 'out' when 'layout' is also available
...
All of the extensions that add the 'layout' keyword also enable (and
required) the use of 'in' and 'out' with shader globals.
This is related to (piglit) bugzilla #31804 .
NOTE: This is a candidate for the 7.9 and 7.10 branches.
2011-01-13 13:35:50 -08:00
e1bc68b014
scons: Fix cross-compilation.
...
Hairy stuff. Don't know how to do it better though.
2011-01-13 20:53:42 +00:00
0448f73f06
r600g: add missing RECIPSQRT_CLAMPED to r600_bc_get_num_operands
2011-01-13 21:29:47 +01:00
a25b91c2c2
r600g: rework bank swizzle code
2011-01-13 21:22:00 +01:00
89275c0b36
r600g: fix alu slot assignment
2011-01-13 19:41:07 +01:00
236e99fe05
r600g: optimize away CF ALU instructions even if type doesn't match
2011-01-13 19:41:07 +01:00
Brian Paul
Christoph Bumiller
Chia-I Wu
Eric Anholt
Vinson Lee
Alex Deucher
Kristian Høgsberg
Christian König
Dave Airlie
Chad Versace
Ian Romanick
José Fonseca