Chia-I Wu [Fri, 10 Dec 2010 19:33:42 +0000 (03:33 +0800)]
mapi: Add a new glapi.h implementation.
The new implementation is based on mapi. No new script is needed. As
noted in sources.mk, the way to use it is to compile MAPI_GLAPI_SOURCES
with MAPI_MODE_GLAPI defined.
Chia-I Wu [Tue, 14 Dec 2010 17:21:33 +0000 (01:21 +0800)]
mapi: Fix glapi printers for gl_and_es_API.xml.
Fix GLAPIPrinter, ES1APIPrinter, and ES2APIPrinter to output files that
are ready for compilation. Since gl_and_es_API.xml is based on
gl_API.xml, the hidden and handcode attributes of entries have to be
overridden for ES1APIPrinter and ES2APIPrinter.
Chia-I Wu [Mon, 6 Dec 2010 14:21:51 +0000 (22:21 +0800)]
mapi: Allow prefix to be macro.
Treat prefix as macro when it is all uppercase. Generate PREFIX(name)
instead of PREFIXname when it is a macro.
Chia-I Wu [Tue, 7 Dec 2010 02:15:50 +0000 (10:15 +0800)]
mapi: Add the ability to parse GLAPI XML.
A prerequisite if we want to convert vgapi.csv to vgapi.xml, or to use
mapi for glapi.
Chia-I Wu [Sat, 11 Dec 2010 18:21:09 +0000 (02:21 +0800)]
glapi: Add gl_and_es_API.xml.
gl_and_es_API.xml defines OpenGL ES 1.1 and 2.0 API as well as OpenGL
API. It consists of gl_API.xml and the newly added es_EXT.xml,
ARB_get_program_binary.xml, OES_single_precision.xml, and
OES_fixed_point.xml.
Kenneth Graunke [Thu, 20 Jan 2011 07:49:54 +0000 (23:49 -0800)]
doxygen: Add glsl to the Makefile and .gitignore.
twied [Mon, 17 Jan 2011 18:46:17 +0000 (19:46 +0100)]
Add machine generated files to .gitignore
Kenneth Graunke [Sat, 15 Jan 2011 23:25:02 +0000 (15:25 -0800)]
glsl: Don't bother unsetting a destructor that was never set.
This was totally copied and pasted from glsl_symbol_table.
Chia-I Wu [Thu, 20 Jan 2011 06:19:13 +0000 (14:19 +0800)]
autoconf: Fail when --with-state-trackers is incomplete.
When --enable-openvg or --enable-gallium-egl is enabled,
--with-state-trackers must have vega or egl.
Henri Verbeet [Thu, 20 Jan 2011 02:11:05 +0000 (19:11 -0700)]
softpipe: Bind samplers to views instead of the underlying resource.
Signed-off-by: Brian Paul <brianp@vmware.com>
Henri Verbeet [Mon, 17 Jan 2011 21:03:29 +0000 (22:03 +0100)]
softpipe: Get rid of the redundant resource parameter to get_sampler_variant().
Signed-off-by: Brian Paul <brianp@vmware.com>
Dave Airlie [Thu, 20 Jan 2011 04:34:32 +0000 (14:34 +1000)]
r200: fix up some problems with TFP on r200
Brian Paul [Thu, 20 Jan 2011 01:45:43 +0000 (18:45 -0700)]
llvmpipe: implement TGSI_PROPERTY_FS_COLOR0_WRITES_ALL_CBUFS
Fixes http://bugs.freedesktop.org/show_bug.cgi?id=33284
Eric Anholt [Wed, 19 Jan 2011 05:26:53 +0000 (21:26 -0800)]
i965/fs: Take the shared mathbox into account in instruction scheduling.
I don't have evidence for this amounting to any improvement,
but it does codify a bit more what we understand so far about
the pipeline.
Eric Anholt [Wed, 19 Jan 2011 06:48:11 +0000 (22:48 -0800)]
i965/fs: Add a helper function for detecting math opcodes.
Eric Anholt [Wed, 19 Jan 2011 06:03:34 +0000 (22:03 -0800)]
i965/fs: Assign URB/CURB register numbers after instruction scheduling.
This fixes a bunch of unnecessary barriers due to the scheduler not
knowing what that arbitrary register description refers to when trying
to reason about its dependencies.
The result is rescheduling in the convolution kernel shader in
Lightsmark, which results in avoiding register spilling and increasing
the performance of the first scene from 6-7 fps midway through the
panning to 11fps. The register spilling was a regression from Mesa
7.9 to Mesa 7.10.
Eric Anholt [Wed, 19 Jan 2011 01:16:49 +0000 (17:16 -0800)]
i965/fs: Add an instruction scheduler.
Improves performance of my GLSL demo by 5.1% (+/- 1.4%, n=7). It also
reschedules the giant multiply tree at the end of
glsl-fs-convolution-1 so that we end up not spilling registers,
producing the expected level of performance.
Eric Anholt [Wed, 19 Jan 2011 05:10:03 +0000 (21:10 -0800)]
i965/fs: Add a helper for detecting texturing opcodes.
Christian König [Wed, 19 Jan 2011 22:46:27 +0000 (23:46 +0100)]
r600g: fix segfault if texture operand is a literal
This fixes Bug 33262
Brian Paul [Wed, 19 Jan 2011 14:41:20 +0000 (07:41 -0700)]
mesa: implement glGetShaderPrecisionFormat()
Drivers should override the default range/precision info as needed.
No drivers do this yet.
Brian Paul [Tue, 18 Jan 2011 23:34:22 +0000 (16:34 -0700)]
gallium/docs: document result type for some types of queries
Dave Airlie [Wed, 19 Jan 2011 06:27:13 +0000 (16:27 +1000)]
radeon: avoid segfault on 3D textures.
This is a candidate for 7.9 and 7.10
Dave Airlie [Wed, 19 Jan 2011 06:17:03 +0000 (16:17 +1000)]
radeon: oops didn't need this logbase2 fn
Dave Airlie [Wed, 19 Jan 2011 05:27:54 +0000 (15:27 +1000)]
radeon: calculate complete texture state inside TFP function
(really not sure why I'm doing this).
This is a candidate for 7.9 and 7.10 branches.
Ben Skeggs [Wed, 19 Jan 2011 05:51:57 +0000 (15:51 +1000)]
dri/nouveau: allow multiple maps of surface buffers
Can happen during swrast fallbacks if a buffer is somehow bound as
a render target and a texture.
Fixes gnome-shell on nv20, and gets it mostly working on nv10.
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
Dave Airlie [Wed, 19 Jan 2011 00:39:32 +0000 (10:39 +1000)]
radeon/r200: fix fbo-clearmipmap + gen-teximage
sw clears were being used and not getting the correct offsets in the span
code.
also not emitting correct offsets for CB draws to texture levels.
(I've no idea why I'm playing with r100).
This is a candidate for 7.9 and 7.10
Eric Anholt [Tue, 18 Jan 2011 21:28:32 +0000 (13:28 -0800)]
i965: Fix a comment typo.
Eric Anholt [Tue, 18 Jan 2011 21:12:25 +0000 (13:12 -0800)]
i965: Fix a bug in i965 compute-to-MRF.
Fixes piglit glsl-fs-texture2d-branching. I couldn't come up with a
testcase that didn't involve dead code, but it's still worthwhile to
fix I think.
Christian König [Tue, 18 Jan 2011 21:45:23 +0000 (22:45 +0100)]
r600g: fix reserve_cfile for R700+
According to R700 ISA we have only two channels for cfile constants.
This patch makes piglit tests "glsl1-constant array with constant
indexing" happy on RV710.
Chad Versace [Tue, 18 Jan 2011 23:15:19 +0000 (15:15 -0800)]
glsl: Fix segfault due to missing printf argument
Fixes the following Piglit tests:
glslparsertest/shaders/array2.frag
glslparsertest/shaders/dataType6.frag
NOTE: This is a candidate for the 7.9 and 7.10 branches.
Chad Versace [Mon, 17 Jan 2011 23:28:39 +0000 (15:28 -0800)]
glsl: Fix semantic checks on precision qualifiers
The check for
Precision qualifiers only apply to floating point and integer types.
was incomplete. It rejected only type 'bool' and structures.
Brian Paul [Wed, 12 Jan 2011 23:13:13 +0000 (16:13 -0700)]
llvmpipe: make sure binning is active when we begin/end a query
This fixes a potential failure when a begin/end_query is the first
thing to happen after flushing the scene.
NOTE: This is a candidate for the 7.10 and 7.9 branches.
Brian Paul [Tue, 18 Jan 2011 19:34:49 +0000 (12:34 -0700)]
softpipe: rename some functions for consistency
Henri Verbeet [Tue, 18 Jan 2011 19:43:56 +0000 (20:43 +0100)]
r600g: Kill trailing whitespace.
Henri Verbeet [Tue, 18 Jan 2011 19:43:56 +0000 (20:43 +0100)]
r600g: Remove the unused eg_states_inc.h and r600_states_inc.h.
Henri Verbeet [Tue, 18 Jan 2011 19:43:56 +0000 (20:43 +0100)]
r600g: Simplify some r600_bc_add_alu_type() calls to r600_bc_add_alu().
Brian Paul [Tue, 18 Jan 2011 19:16:58 +0000 (12:16 -0700)]
vbo: initialize num_instances in a few places
This fixes https://bugs.freedesktop.org/show_bug.cgi?id=33247
There might still be some issues with drawing multiple instances
with VBO splitting to investigate someday.
Eric Anholt [Tue, 18 Jan 2011 09:08:51 +0000 (01:08 -0800)]
ra: Take advantage of the adjacency list in finding a node to spill.
This revealed a bug in ra_get_spill_benefit where we only considered
the benefit of the first adjacency we were to remove, explaining some
of the ugly spilling I've seen in shaders. Because of the reduced
spilling, it reduces the runtime of glsl-fs-convolution-1 36.9% +/-
0.9% (n=5).
Eric Anholt [Tue, 18 Jan 2011 09:04:55 +0000 (01:04 -0800)]
ra: Remove unused "name" field in regs.
Eric Anholt [Tue, 18 Jan 2011 08:33:35 +0000 (00:33 -0800)]
ra: Take advantage of the adjacency list in ra_select() too.
Reduces runtime of glsl-fs-convolution-1 another 13.9% +/- 0.6% (n=5).
Eric Anholt [Tue, 18 Jan 2011 08:19:48 +0000 (00:19 -0800)]
ra: Add an adjacency list to trade space for time in ra_simplify().
This was recommended in the original paper, but I figued "make it run"
before "make it fast". Now we make it fast. Reduces the runtime of
glsl-fs-convolution-1 by 12.7% +/- 0.6% (n=5).
Eric Anholt [Tue, 18 Jan 2011 06:07:55 +0000 (22:07 -0800)]
glsl: Skip the rest of loop unrolling if no loops were found.
Shaves 1.6% (+/- 1.0%) off of ff_fragment_shader glean texCombine time
(n=5).
Eric Anholt [Tue, 18 Jan 2011 02:34:43 +0000 (18:34 -0800)]
ra: Trade off some space to get time efficiency in ra_set_finalize().
Our use of the register allocator in i965 is somewhat unusual.
Whereas most architectures would have a smaller set of registers with
fewer register classes and reuse that across compilation, we have 1,
2, and 4-register classes (usually) and a variable number up to 128
registers per compile depending on how many setup parameters and push
constants are present. As a result, when compiling large numbers of
programs (as with glean texCombine going through ff_fragment_shader),
we spent much of our CPU time in computing the q[] array. By keeping
a separate list of what the conflicts are for a particular reg, we
reduce glean texCombine time 17.0% +/- 2.3% (n=5).
We don't expect this optimization to be useful for 915, which will
have a constant register set, but it would be useful if we were switch
to this register allocator for Mesa IR.
Brian Paul [Tue, 18 Jan 2011 16:58:55 +0000 (09:58 -0700)]
softpipe: added some null pointer checks
This shouldn't really be needed but it may help with
http://bugs.freedesktop.org/show_bug.cgi?id=32309
Brian Paul [Tue, 18 Jan 2011 16:57:52 +0000 (09:57 -0700)]
softpipe: s/tex_cache/fragment_tex_cache/
Just to be more consistant with the vertex and geometry tex cache fields.
José Fonseca [Tue, 18 Jan 2011 15:05:57 +0000 (15:05 +0000)]
Remove executables from source tree.
Andre Maasikas [Tue, 18 Jan 2011 14:05:45 +0000 (16:05 +0200)]
r600c: preserve correct buffer when using fbo
Hopefully better than previous - this passes more mipgen tests
Andre Maasikas [Tue, 18 Jan 2011 14:04:43 +0000 (16:04 +0200)]
r600: set border color as RGBA
border color is RGBA for samples - this passes texenv tests
Andre Maasikas [Tue, 18 Jan 2011 14:02:45 +0000 (16:02 +0200)]
r600c: use STATE_FB_WPOS_Y_TRANSFORM variable to do wpos transform
use introduced STATE_FB_WPOS_Y_TRANSFORM variable (thanks Marek)
this gets coords also right when using fbo
Eric Anholt [Tue, 18 Jan 2011 00:02:58 +0000 (16:02 -0800)]
i965: Fix dead pointers to fp->Parameters->ParameterValues[] after realloc.
Fixes texrect-many regression with ff_fragment_shader -- as we added
refs to the subsequent texcoord scaling paramters, the array got
realloced to a new address while our params[] still pointed at the old
location.
Brian Paul [Mon, 17 Jan 2011 23:42:43 +0000 (16:42 -0700)]
llvmpipe: enable PIPE_CAP_INDEP_BLEND_FUNC
The driver was saying that independend blend functions was not supported,
but it really was. The driver was using the per-target independend blend
factors but the state tracker was only setting the 0th one (per the
Gallium spec).
Fixes a piglit fbo-drawbuffers2-blend regression.
See https://bugs.freedesktop.org/show_bug.cgi?id=33215
Brian Paul [Mon, 17 Jan 2011 23:29:28 +0000 (16:29 -0700)]
st/mesa: move PIPE_CAP_INDEP_BLEND_FUNC code
Chad Versace [Mon, 17 Jan 2011 21:52:40 +0000 (13:52 -0800)]
doxygen: Add doxyfile for glsl module
Chad Versace [Mon, 17 Jan 2011 17:42:08 +0000 (09:42 -0800)]
glsl: Refresh autogenerated parser files
Chad Versace [Mon, 17 Jan 2011 05:55:01 +0000 (21:55 -0800)]
glsl: Remove redundant semantic check in parser
The removed semantic check also exists in ast_type_specifier::hir(), which
is a more natural location for it.
The check verified that precision statements are applied only to types
float and int.
Chad Versace [Mon, 17 Jan 2011 05:44:57 +0000 (21:44 -0800)]
glsl: Add support for default precision statements
* Add new field ast_type_specifier::is_precision_statement.
* Add semantic checks in ast_type_specifier::hir().
* Alter parser rules accordingly.
Chad Versace [Mon, 17 Jan 2011 06:38:45 +0000 (22:38 -0800)]
glsl: Add semantic checks for precision qualifiers
* Check that precision qualifiers only appear in language versions 1.00,
1.30, and later.
* Check that precision qualifiers do not apply to bools and structs.
Fixes the following Piglit tests:
* spec/glsl-1.30/precision-qualifiers/precision-bool-01.frag
* spec/glsl-1.30/precision-qualifiers/precision-struct-01.frag
* spec/glsl-1.30/precision-qualifiers/precision-struct-02.frag
Chad Versace [Mon, 17 Jan 2011 06:08:56 +0000 (22:08 -0800)]
glsl: Fix parser rule for type_specifier
Do not assign a value to ast_type_specifier::precision when no precision
qualifier is present.
Chad Versace [Fri, 14 Jan 2011 17:50:55 +0000 (09:50 -0800)]
glsl: Change default value of ast_type_specifier::precision
Change default value to ast_precision_none, which denotes the absence of
a precision of a qualifier.
Previously, the default value was ast_precision_high. This made it
impossible to detect if a precision qualifier was present or not.
Chad Versace [Wed, 12 Jan 2011 02:24:17 +0000 (18:24 -0800)]
glsl: Check that 'centroid in' does not occur in vertex shader
The check is performed only in GLSL versions >= 1.30.
From section 4.3.4 of the GLSL 1.30 spec:
"It is an error to use centroid in in a vertex shader."
Fixes Piglit test
spec/glsl-1.30/compiler/storage-qualifiers/vs-centroid-in-01.vert
Chad Versace [Wed, 12 Jan 2011 02:13:26 +0000 (18:13 -0800)]
glsl: Check that interpolation quals only apply to vertex ins and fragment outs
The check is performed only in GLSL versions >= 1.30.
Fixes the following Piglit tests:
* spec/glsl-1.30/compiler/interpolation-qualifiers/fs-smooth-02.frag
* spec/glsl-1.30/compiler/interpolation-qualifiers/vs-smooth-01.vert
Chad Versace [Wed, 12 Jan 2011 01:21:18 +0000 (17:21 -0800)]
glsl: Check that interpolation qualifiers do not precede 'varying'
... and 'centroid varying'. The check is performed only in GLSL
versions >= 1.30.
From page 29 (page 35 of the PDF) of the GLSL 1.30 spec:
"interpolation qualifiers may only precede the qualifiers in, centroid
in, out, or centroid out in a declaration. They do not apply to the
deprecated storage qualifiers varying or centroid varying."
Fixes Piglit test
spec/glsl-1.30/compiler/interpolation-qualifiers/smooth-varying-01.frag.
Chad Versace [Wed, 12 Jan 2011 00:59:24 +0000 (16:59 -0800)]
glsl: Add method ast_type_qualifier::interpolation_string()
If an interpolation qualifier is present, then the method returns that
qualifier's string representation. For example, if the noperspective bit
is set, then it returns "noperspective".
Brian Paul [Mon, 17 Jan 2011 16:56:56 +0000 (09:56 -0700)]
vbo: init num_instances in split_prims()
Fixes a VTK regression after adding GL_ARB_draw_instanced.
Brian Paul [Mon, 17 Jan 2011 16:40:16 +0000 (09:40 -0700)]
tnl: assert that num_instances > 0
Brian Paul [Mon, 17 Jan 2011 16:33:47 +0000 (09:33 -0700)]
mesa: s/primcount/numInstances/
primcount is also a parameter to glMultiDrawElements(). Use numInstances
to avoid confusion between these things.
Dave Airlie [Mon, 17 Jan 2011 05:41:49 +0000 (15:41 +1000)]
nouveau: fix build against out of tree libdrm
For doing builds against a separated libdrm these cflags are needed.
Signed-off-by: Dave Airlie <airlied@redhat.com>
Christian König [Sun, 16 Jan 2011 22:52:53 +0000 (23:52 +0100)]
r600g: fix PIPE_CAP_INSTANCED_DRAWING warning
Christian König [Sun, 16 Jan 2011 20:21:41 +0000 (21:21 +0100)]
r600g: fix alu inst group merging for relative adressing
Christoph Bumiller [Sun, 16 Jan 2011 13:10:46 +0000 (14:10 +0100)]
nvc0: fix and enable instanced drawing and arrays
Chia-I Wu [Sun, 16 Jan 2011 09:34:40 +0000 (17:34 +0800)]
d3d1x: Fix broken build.
st/egl native.h changed its interface in
a22a332fc7cc54d4d0973dcd21a90159cc51de1a.
Brian Paul [Sun, 16 Jan 2011 03:41:26 +0000 (20:41 -0700)]
mesa: minor tweaks in _mesa_set_fetch_functions()
Brian Paul [Sun, 16 Jan 2011 03:41:06 +0000 (20:41 -0700)]
mesa: add comment for _mesa_get_srgb_format_linear()
Brian Paul [Sun, 16 Jan 2011 03:37:57 +0000 (20:37 -0700)]
mesa: move declarations before code
Dave Airlie [Sun, 16 Jan 2011 02:54:57 +0000 (12:54 +1000)]
docs: add GL_EXT_texture_sRGB_decode to relnotes
Dave Airlie [Thu, 13 Jan 2011 07:22:54 +0000 (17:22 +1000)]
gallium: add EXT_texture_sRGB_decode.
This uses a sampler view to access the texture with the alternate format.
Signed-off-by: Dave Airlie <airlied@redhat.com>
Dave Airlie [Thu, 13 Jan 2011 05:54:29 +0000 (15:54 +1000)]
i965: add support for EXT_texture_sRGB_decode
We just choose the texture format depending on the srgb decode bit
for the sRGB formats.
Signed-off-by: Dave Airlie <airlied@redhat.com>
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