Dave Airlie [Thu, 13 Jan 2011 02:12:21 +0000 (12:12 +1000)]
mesa/swrast: implement EXT_texture_sRGB_decode
This implements the extension by choosing a different set of texture
fetch functions when the texture parameter changes.
Signed-off-by: Dave Airlie <airlied@redhat.com>
Christian König [Sun, 16 Jan 2011 00:45:06 +0000 (01:45 +0100)]
r600d: fix some bugs added reworking literal handling
If a literal slot isn't used it should be set
to 0 instead of an uninitialized value. Also the
channels for pre R700 trig functions were incorrect.
And most important literals were not counted against ndw,
resulting in an invalid force_add_cf detection.
Brian Paul [Sun, 16 Jan 2011 01:33:01 +0000 (18:33 -0700)]
docs: document GL_ARB_draw_buffers_blend
Brian Paul [Wed, 12 Jan 2011 15:08:22 +0000 (08:08 -0700)]
mesa: implement glGet queries for GL_ARB_draw_buffers_blend
Brian Paul [Sun, 16 Jan 2011 01:25:19 +0000 (18:25 -0700)]
mesa: display list support for GL_ARB_draw_buffers_blend functions
Brian Paul [Wed, 12 Jan 2011 03:56:01 +0000 (20:56 -0700)]
mesa: plug in GL_ARB_draw_buffers_blend functions
Brian Paul [Wed, 12 Jan 2011 03:55:42 +0000 (20:55 -0700)]
glapi: regenerated files
Brian Paul [Wed, 12 Jan 2011 03:55:19 +0000 (20:55 -0700)]
glapi: new entrypoint specs for GL_ARB_draw_buffers_blend
Brian Paul [Tue, 11 Jan 2011 22:07:38 +0000 (15:07 -0700)]
mesa: begin implementation of GL_ARB_draw_buffers_blend
Brian Paul [Sun, 16 Jan 2011 00:41:43 +0000 (17:41 -0700)]
docs: update GL3.txt status
Brian Paul [Sun, 16 Jan 2011 00:40:56 +0000 (17:40 -0700)]
docs: document GL_ARB_instanced_arrays
Brian Paul [Sun, 16 Jan 2011 00:35:08 +0000 (17:35 -0700)]
st/mesa: GL_ARB_instanced_arrays support
Brian Paul [Sat, 15 Jan 2011 17:32:34 +0000 (10:32 -0700)]
mesa: support for GL_ARB_instanced_arrays
Brian Paul [Sat, 15 Jan 2011 17:32:34 +0000 (10:32 -0700)]
glapi: regenerated files
Brian Paul [Sat, 15 Jan 2011 17:32:34 +0000 (10:32 -0700)]
glapi: GL_ARB_instanced_arrays support
Brian Paul [Sun, 16 Jan 2011 00:33:19 +0000 (17:33 -0700)]
draw: add missing LP_CHECK_MEMBER_OFFSET()
Brian Paul [Sun, 16 Jan 2011 00:23:13 +0000 (17:23 -0700)]
st/mesa: move/consolidate an assignment
Brian Paul [Sat, 15 Jan 2011 17:26:25 +0000 (10:26 -0700)]
docs: document GL_ARB_draw_instanced
Henri Verbeet [Sat, 15 Jan 2011 18:39:52 +0000 (19:39 +0100)]
r600g: Remove the redundant radeon_new() prototype.
Henri Verbeet [Sat, 15 Jan 2011 18:39:52 +0000 (19:39 +0100)]
r600g: Fix some register value name typos.
SFR -> SRF.
Henri Verbeet [Sat, 15 Jan 2011 18:39:52 +0000 (19:39 +0100)]
r600g: Get rid of r600_translate_vertex_data_type().
This has been replaced with r600_vertex_data_type().
Brian Paul [Sat, 15 Jan 2011 17:24:08 +0000 (10:24 -0700)]
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
Christoph Bumiller [Sat, 15 Jan 2011 13:10:27 +0000 (14:10 +0100)]
nvc0: try to swap immediates to first source too
Christoph Bumiller [Sat, 15 Jan 2011 13:03:05 +0000 (14:03 +0100)]
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.
Christoph Bumiller [Sat, 15 Jan 2011 11:18:52 +0000 (12:18 +0100)]
nvc0: update user vbufs on each draw call
This is required in case set_vertex_buffers is not called again.
Christoph Bumiller [Thu, 13 Jan 2011 20:03:18 +0000 (21:03 +0100)]
nvc0: enable early fragment tests where possible
Christoph Bumiller [Sat, 15 Jan 2011 11:17:00 +0000 (12:17 +0100)]
nvc0: upload small buffers through the command buffer
Chia-I Wu [Sat, 15 Jan 2011 04:39:24 +0000 (12:39 +0800)]
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.
Chia-I Wu [Fri, 14 Jan 2011 19:15:41 +0000 (03:15 +0800)]
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.
Chia-I Wu [Fri, 14 Jan 2011 19:24:15 +0000 (03:24 +0800)]
targets/egl: i965 needs libwsw.
Fix undefined symbol wrapper_sw_winsys_dewrap_pipe_screen.
Eric Anholt [Sat, 15 Jan 2011 00:18:51 +0000 (16:18 -0800)]
mesa: Add getter for GL_SHADER_COMPILER with ARB_ES2_compatibility.
Fixes piglit arb_es2_compatibility-shadercompiler
Eric Anholt [Sat, 15 Jan 2011 00:12:18 +0000 (16:12 -0800)]
mesa: Add getters for ARB_ES2_compatibility MAX_*_VECTORS.
Fixes piglit arb_es2_compatibility-maxvectors.
Eric Anholt [Fri, 14 Jan 2011 23:53:38 +0000 (15:53 -0800)]
mesa: Add support for glDepthRangef and glClearDepthf.
These are ARB_ES2_compatibility float variants of the core double
entrypoints. Fixes arb_es2_compatibility-depthrangef.
Eric Anholt [Sat, 15 Jan 2011 00:48:19 +0000 (16:48 -0800)]
ir_to_mesa: Fix segfaults on ir_to_mesa invocation after MSVC change.
Brian Paul [Sat, 15 Jan 2011 00:45:23 +0000 (17:45 -0700)]
glsl: fix implicit int to bool warning
Maybe preprocess() should return a bool.
Brian Paul [Sat, 15 Jan 2011 00:27:17 +0000 (17:27 -0700)]
docs: skeleton file for 7.11 release notes, add missing links
Vinson Lee [Sat, 15 Jan 2011 00:18:52 +0000 (16:18 -0800)]
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
Eric Anholt [Fri, 14 Jan 2011 23:08:00 +0000 (15:08 -0800)]
mesa: Add actual support for glReleaseShaderCompiler from ES2.
Fixes no-op dispatch warning in piglit
arb_es2_compatibility-releaseshadercompiler.c.
Eric Anholt [Fri, 14 Jan 2011 22:07:28 +0000 (14:07 -0800)]
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.
Eric Anholt [Fri, 14 Jan 2011 22:50:58 +0000 (14:50 -0800)]
mesa: Add extension enable bit for GL_ARB_ES2_compatibility.
Eric Anholt [Fri, 14 Jan 2011 22:03:52 +0000 (14:03 -0800)]
glapi: Regenerate for GL_ARB_ES2_compatibility.
Eric Anholt [Wed, 4 Aug 2010 01:56:07 +0000 (18:56 -0700)]
glapi: Add entrypoints and enums for GL_ARB_ES2_compatibility.
Alex Deucher [Fri, 14 Jan 2011 22:47:29 +0000 (17:47 -0500)]
r600g: compiler helper opcode fixes for evergreen
Signed-off-by: Alex Deucher <alexdeucher@gmail.com>
Alex Deucher [Fri, 14 Jan 2011 22:50:29 +0000 (17:50 -0500)]
r600g: pass r600_bc to some addition compiler helper functions
needed for asic specific opcodes
Signed-off-by: Alex Deucher <alexdeucher@gmail.com>
Vinson Lee [Fri, 14 Jan 2011 22:19:02 +0000 (14:19 -0800)]
generate_builtins.py: Whitespace fixes.
Also removed unnecessary semicolons.
Vinson Lee [Fri, 14 Jan 2011 22:17:03 +0000 (14:17 -0800)]
generate_builtins.py: Fix builds using Python 2.5.
Eric Anholt [Fri, 14 Jan 2011 21:17:59 +0000 (13:17 -0800)]
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.
Eric Anholt [Fri, 14 Jan 2011 19:53:38 +0000 (11:53 -0800)]
i965: Add an invalidation of live intervals after register splitting.
No effect, since it was called before live intervals were calculated.
Eric Anholt [Thu, 13 Jan 2011 18:05:50 +0000 (10:05 -0800)]
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.
Eric Anholt [Thu, 13 Jan 2011 02:25:33 +0000 (18:25 -0800)]
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.
Eric Anholt [Wed, 12 Jan 2011 20:29:38 +0000 (12:29 -0800)]
i915: Fix compiler warning from sw fallback removal change.
Vinson Lee [Fri, 14 Jan 2011 21:47:37 +0000 (13:47 -0800)]
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
323ef3a1f07ba4333dadebab571ddcd49d95f45c but the
macro is undefined. Disable this case to fix the build for now.
Kristian Høgsberg [Fri, 14 Jan 2011 21:11:28 +0000 (16:11 -0500)]
gles2: Also support GL_BGRA_EXT for glTexSubImage2d
Christian König [Fri, 14 Jan 2011 17:46:11 +0000 (18:46 +0100)]
r600g: add more missing instructions to r600_bc_get_num_operands
Chia-I Wu [Fri, 14 Jan 2011 06:29:04 +0000 (14:29 +0800)]
egl: Fix EGL_VERSION string.
Fix a copy-and-paste error in
a4a38dcf61f141297a083ccac217200947d57b0d.
Chia-I Wu [Fri, 14 Jan 2011 06:11:35 +0000 (14:11 +0800)]
egl: Fix an assertion in _eglUpdateAPIsString.
dpy->ClientAPIs was renamed in
a4a38dcf61f141297a083ccac217200947d57b0d.
Dave Airlie [Thu, 13 Jan 2011 05:46:44 +0000 (15:46 +1000)]
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>
Dave Airlie [Fri, 14 Jan 2011 04:57:54 +0000 (14:57 +1000)]
srgb: fix fbo base format picking.
Pointed out by Brian.
Chad Versace [Thu, 13 Jan 2011 00:09:37 +0000 (16:09 -0800)]
i915: Disable extension OES_standard_derivatives
OES_standard_derivatives must be manually disabled for i915 because Mesa
enables it by default.
Chad Versace [Wed, 12 Jan 2011 23:47:26 +0000 (15:47 -0800)]
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.
Vinson Lee [Thu, 13 Jan 2011 22:17:01 +0000 (14:17 -0800)]
r600g: Move declaration before code in r600_asm.c.
Fixes SCons build.
Christian König [Wed, 22 Dec 2010 16:45:51 +0000 (17:45 +0100)]
r600g: rework literal handling
Christian König [Mon, 20 Dec 2010 21:09:09 +0000 (22:09 +0100)]
r600g: merge alu groups
Christian König [Sat, 18 Dec 2010 20:32:16 +0000 (21:32 +0100)]
r600g: implement replacing gpr with pv and ps
Ian Romanick [Sat, 8 Jan 2011 00:53:59 +0000 (16:53 -0800)]
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.
Ian Romanick [Sat, 8 Jan 2011 00:53:07 +0000 (16:53 -0800)]
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.
José Fonseca [Thu, 13 Jan 2011 20:52:01 +0000 (20:52 +0000)]
scons: Fix cross-compilation.
Hairy stuff. Don't know how to do it better though.
Christian König [Thu, 13 Jan 2011 20:29:47 +0000 (21:29 +0100)]
r600g: add missing RECIPSQRT_CLAMPED to r600_bc_get_num_operands
Christian König [Sat, 18 Dec 2010 16:56:36 +0000 (17:56 +0100)]
r600g: rework bank swizzle code
Christian König [Sat, 18 Dec 2010 12:57:18 +0000 (13:57 +0100)]
r600g: fix alu slot assignment
Christian König [Fri, 17 Dec 2010 23:45:59 +0000 (00:45 +0100)]
r600g: optimize away CF ALU instructions even if type doesn't match
Christoph Bumiller [Thu, 13 Jan 2011 18:36:25 +0000 (19:36 +0100)]
nvc0: identify POINT_RASTER_RULES, add POINT_SMOOTH state
Point smoothing requires rasterization rules to be set to OGL.
Sorry for the extra noise caused by the header update.
Chia-I Wu [Thu, 13 Jan 2011 17:50:51 +0000 (01:50 +0800)]
draw: Fix an off-by-one bug in a vsplit assertion.
When use_spoken is true, istart (the first vertex of this segment) is
replaced by i0 (the spoken vertex of the fan). There are still icount
vertices.
Thanks to Brian Paul for spotting this.
Vinson Lee [Thu, 13 Jan 2011 17:28:47 +0000 (09:28 -0800)]
i965: Remove unnecessary headers.
Vinson Lee [Thu, 13 Jan 2011 17:16:25 +0000 (09:16 -0800)]
targets/egl-static: Remove unnecessary header.
Vinson Lee [Thu, 13 Jan 2011 17:07:19 +0000 (09:07 -0800)]
r600g: Silence uninitialized variable warnings.
Vinson Lee [Thu, 13 Jan 2011 16:53:33 +0000 (08:53 -0800)]
mesa: Add missing break statement in SARGB8 case.
Brian Paul [Thu, 13 Jan 2011 16:25:55 +0000 (09:25 -0700)]
egl: need stdio.h for non-Windows build too to avoid compiler warning
Paulo Zanoni [Thu, 13 Jan 2011 12:59:12 +0000 (04:59 -0800)]
dri_util: fail driCreateNewScreen if InitScreen is NULL
Without this, X doesn't start with UMS on r300g.
NOTE: This is a candidate for the 7.9 and 7.10 branches.
Signed-off-by: Paulo Zanoni <pzanoni@mandriva.com>
Signed-off-by: Brian Paul <brianp@vmware.com>
José Fonseca [Thu, 13 Jan 2011 12:33:41 +0000 (12:33 +0000)]
scons: Ensure the OpenVG/EGL import libs are also prefixed with 'lib'.
José Fonseca [Thu, 13 Jan 2011 11:54:43 +0000 (11:54 +0000)]
scons: Build libOpenVG.dll & libEGL.dll
But without creating liblibOpenVG or liblibEGL elsewhere.
Thanks Chia-I Wu for pointing this out.
José Fonseca [Thu, 13 Jan 2011 11:45:40 +0000 (11:45 +0000)]
util: Undo spurious changes in last commit.
José Fonseca [Thu, 13 Jan 2011 11:44:16 +0000 (11:44 +0000)]
util: Don't limit debug_printf message length on unices.
Chia-I Wu [Wed, 12 Jan 2011 20:40:38 +0000 (04:40 +0800)]
egl: Improve driver selection.
The idea is to be able to match a driver using the following order
try egl_gallium with hw renderer
try egl_dri2
try egl_gallium with sw renderer
try egl_glx
given the module list
egl_gallium
egl_dri2
egl_glx
For that, UseFallback initialization option is added. The module list
is matched twice: with the option unset and with the option set. In the
first pass, egl_gallium skips its sw renderer and egl_glx rejects to
initialize since UseFallback is not set. In the second pass,
egl_gallium skips its hw renderer and egl_dri2 rejects to initialize
since UseFallback is set. The process stops at the first driver that
initializes the display.
Chia-I Wu [Wed, 12 Jan 2011 16:27:45 +0000 (00:27 +0800)]
egl: Simplify driver matching.
Add initialization options that drv->API.Initialize should support.
Replace drv->Probe by TestOnly initialization option and simplify
_eglMatchDriver.
Chia-I Wu [Thu, 13 Jan 2011 08:53:13 +0000 (16:53 +0800)]
egl: Cleanup _EGLDisplay initialization.
Reorder/rename and document the fields that should be set by the driver during
initialization. Drop the major/minor arguments from drv->API.Initialize.
Kenneth Graunke [Sat, 1 Jan 2011 20:43:03 +0000 (12:43 -0800)]
glsl/s_expression: Read and ignore Scheme-style comments.
A single-semicolon until the end of the line, i.e.
; this is a comment.
Kenneth Graunke [Sat, 1 Jan 2011 11:43:07 +0000 (03:43 -0800)]
glsl/builtins: Remove unnecessary (constant bool (1)) from assignments.
This isn't strictly necessary, but is definitely nicer.
Kenneth Graunke [Sat, 1 Jan 2011 11:37:02 +0000 (03:37 -0800)]
ir_reader: Make assignment conditions optional.
You can now simply write (assign (xy) <lhs> <rhs>) instead of the
verbose (assign (constant bool (1)) (xy) <lhs> <rhs>).
Kenneth Graunke [Sat, 1 Jan 2011 09:17:59 +0000 (01:17 -0800)]
ir_reader: Convert to a class.
This makes it unnecessary to pass _mesa_glsl_parse_state around
everywhere, making at least the prototypes a lot easier to read.
It's also more C++-ish than a pile of static C functions.
Kenneth Graunke [Fri, 31 Dec 2010 10:17:58 +0000 (02:17 -0800)]
ir_reader: Combine the three dereference reading functions into one.
These used to be more complicated, but now are so simple there's no real
point in keeping them separate.
Kenneth Graunke [Fri, 31 Dec 2010 10:03:21 +0000 (02:03 -0800)]
ir_reader: Relax requirement that function arguments be s_lists.
All of these functions used to take s_list pointers so they wouldn't all
need SX_AS_LIST conversions and error checking. However, the new
pattern matcher conveniently does this for us in one centralized place.
So there's no need to insist on s_list. Switching to s_expression saves
a bit of code and is somewhat cleaner.
Kenneth Graunke [Fri, 31 Dec 2010 09:48:02 +0000 (01:48 -0800)]
ir_reader: Remove s_list::length() method.
Most code now relies on the pattern matcher rather than this function,
and for the only remaining case, not using this saves an iteration.
Kenneth Graunke [Wed, 3 Nov 2010 19:47:06 +0000 (12:47 -0700)]
ir_reader: Add a pattern matching system and use it everywhere.
Previously, the IR reader was riddled with code that:
1. Checked for the right number of list elements (via a linked list walk)
2. Retrieved references to each component (via ->next->next pointers)
3. Downcasted as necessary to make sure that each sub-component was the
right type (i.e. symbol, int, list).
4. Checking that the tag (i.e. "declare") was correct.
This was all very ad-hoc and a bit ugly. Error checking had to be done
at both steps 1, 3, and 4. Most code didn't even check the tag, relying
on the caller to do so. Not all callers did.
The new pattern matching module performs the whole process in a single
straightforward function call, resulting in shorter, more readable code.
Unfortunately, MSVC does not support C99-style anonymous arrays, so the
pattern must be declared outside of the match call.
Dave Airlie [Thu, 13 Jan 2011 06:49:32 +0000 (16:49 +1000)]
mesa/srgb: handle SARGB8 case in the sw fbo renderer.
Fredrik Höglund [Thu, 6 Jan 2011 22:12:08 +0000 (23:12 +0100)]
st/mesa: fix a regression from
cae2bb76
stObj->pt is null when a TFP texture is passed to st_finalize_texture,
and with the changes introduced in the above commit this resulted in a
new texture being created and the existing image being copied into it.
NOTE: This is a candidate for the 7.10 branch.
Reviewed-by: Alex Deucher <alexdeucher@gmail.com>
Ben Skeggs [Thu, 13 Jan 2011 05:25:37 +0000 (15:25 +1000)]
nvc0: disable calling of sw methods we don't implement
Left in the code as a marker of what NVIDIA do, just in case we need
to do this some day.
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
Dave Airlie [Thu, 13 Jan 2011 05:16:11 +0000 (15:16 +1000)]
mesa/fbo: prevent assert trigger on i965 with piglit fbo-srgb test.
Ben Skeggs [Thu, 13 Jan 2011 03:23:55 +0000 (13:23 +1000)]
nvc0: fix mp_stack_bo relocation
Fixes a PT_NOT_PRESENT error cause by:
- allocating in VRAM
- emitting GART relocs to 0x17bc/0x17c0, moving the buffer
- telling the bufmgr that the buffer should be in VRAM when we use it,
but not correcting the value sent to 0x17bc/0x17c0.
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
Vinson Lee [Thu, 13 Jan 2011 01:43:28 +0000 (17:43 -0800)]
mesa: Move loop variable declarations outside for loop in extensions.c.
Fixes MSVC build.