History log of /external/mesa3d/src/mesa/main/uniforms.c
Revision Date Author Comments (<<< Hide modified files) (Show modified files >>>)
4cdbf27fac2537fe1c5216afd5c10bde224eb57b 05-Sep-2012 Ian Romanick <ian.d.romanick@intel.com> mesa: Don't set uniform dispatch pointers for many things in ES2 or core

NOTE: This is a candidate for the 9.0 branch

Signed-off-by: Ian Romanick <ian.d.romanick@intel.com>
Reviewed-by: Eric Anholt <eric@anholt.net>
(cherry picked from commit 6c01a0e770432eda0e29dbd7278a94efc688a6d3)
/external/mesa3d/src/mesa/main/uniforms.c
fa08b8ad549ef0ad0ee46f525f6f5dd0d6332f99 25-Jun-2012 Eric Anholt <eric@anholt.net> mesa: Return -1 for glGetUniformLocation on UBOs.

Fixes piglit ARB_uniform_buffer_object/getuniformlocation.

Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
Reviewed-by: Ian Romanick <ian.d.romanick@intel.com>
/external/mesa3d/src/mesa/main/uniforms.c
eed967bc9c27ff911c036b1363e5303bf6c7827f 21-Jun-2012 Eric Anholt <eric@anholt.net> mesa: Add support for GL_ARB_ubo's glGetActiveUniformName().

This is like a stripped-down version of glGetActiveUniform that just
returns the name, since the other return values (type and size) of
that function are now meant to be handled with
glGetActiveUniformsiv().

Fixes piglit ARB_uniform_buffer_object/getactiveuniformname

Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
Reviewed-by: Ian Romanick <ian.d.romanick@intel.com>
/external/mesa3d/src/mesa/main/uniforms.c
dc654370c39d6597b63ff469fc79aa1c22c079fe 19-Jun-2012 Eric Anholt <eric@anholt.net> mesa: Add support for most of the other pnames of glGetActiveUniformBlockiv().

Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
Reviewed-by: Ian Romanick <ian.d.romanick@intel.com>
/external/mesa3d/src/mesa/main/uniforms.c
5a165d1f3ae8eddb96c2d2026ac4a8f981733ac5 20-Jun-2012 Eric Anholt <eric@anholt.net> mesa: Add support for getting active uniform block names.

Fixes piglit ARB_uniform_buffer_object/getactiveuniformblockname.

Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
Reviewed-by: Ian Romanick <ian.d.romanick@intel.com>
/external/mesa3d/src/mesa/main/uniforms.c
467304dfe56bb4e3a66f500db5754500cc18955a 19-Jun-2012 Eric Anholt <eric@anholt.net> mesa: Add support for glUniformBlockBinding() and the API to get it back.

Fixes piglit ARB_uniform_buffer_object/uniformbufferbinding.

Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
Reviewed-by: Ian Romanick <ian.d.romanick@intel.com>
/external/mesa3d/src/mesa/main/uniforms.c
ddc88fbf510ee8ba35b974cc21c595e96d115cc8 01-May-2012 Eric Anholt <eric@anholt.net> mesa: Add implementation of glGetUniformBlockIndex().

Now that we finally have a list of uniform blocks in the linked shader
program, we can tell what their indices are.

Fixes piglit GL_ARB_uniform_buffer_object/getuniformblockindex.

Reviewed-by: Ian Romanick <ian.d.romanick@intel.com>
/external/mesa3d/src/mesa/main/uniforms.c
9f1a4a6340824786142be9bc14f0c3418f14a69f 28-Apr-2012 Eric Anholt <eric@anholt.net> mesa: Add support for glGetActiveUniformsiv on non-UBO pnames.

We'll need to propagate the UBO fields to the uniform storage records
before we can handle the other pnames.

Reviewed-by: Ian Romanick <ian.d.romanick@intel.com>
/external/mesa3d/src/mesa/main/uniforms.c
acfbdfcbc8263cc0ace3468457a209dd80da017e 28-Apr-2012 Eric Anholt <eric@anholt.net> mesa: Add support for glGetUniformIndices().

This is a single entrypoint that maps from a series of names to the
indices of those names within the active uniforms list. Each index is
like glGetUniformLocation()'s return value, except that it doesn't
encode an array offset.

Reviewed-by: Ian Romanick <ian.d.romanick@intel.com>
/external/mesa3d/src/mesa/main/uniforms.c
abcdbdf9cce3c7520ee999fac3099d609960847d 25-Jun-2012 Eric Anholt <eric@anholt.net> mesa: Move the _mesa_uniform_merge_location_offset to glGetUniformLocation().

With the upcoming GL_ARB_uniform_buffer_object changes, the only
other caller that will want the cooked value is state_tracker.

Reviewed-by: Ian Romanick <ian.d.romanick@intel.com>
/external/mesa3d/src/mesa/main/uniforms.c
b610881317a7775a7ffe5f032099d8b2dc45eff0 10-Apr-2012 Ian Romanick <ian.d.romanick@intel.com> glsl: Initialize samplers to 0, propagate sampler values to the gl_program

The spec requires that samplers be initialized to 0. Since this
differs from the 1-to-1 mapping of samplers to texture units assumed
by ARB assembly shaders (and the gl_program structure), be sure to
propagate this date from the gl_shader_program to the gl_program.

Signed-off-by: Ian Romanick <ian.d.romanick@intel.com>
Reviewed-by: Eric Anholt <eric@anholt.net>
Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
CC: Vadim Girlin <vadimgirlin@gmail.com>
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=49088
/external/mesa3d/src/mesa/main/uniforms.c
b536ac6b2bc54ad9bb6e58fbd307055e419a288f 22-Dec-2011 Dylan Noblesmith <nobled@dreamwidth.org> mesa: add back glGetnUniform*v() overflow error reporting

The error was removed in:

commit 719909698c67c287a393d2380278e7b7495ae018
Author: Ian Romanick <ian.d.romanick@intel.com>
Date: Tue Oct 18 16:01:49 2011 -0700

mesa: Rewrite the way uniforms are tracked and handled

The GL_ARB_robustness spec doesn't say the implementation
should truncate the output, so just return after setting
the required error like it did before the above commit.

Also fixup an old comment and add an assert.

NOTE: This is a candidate for the 8.0 branch.
/external/mesa3d/src/mesa/main/uniforms.c
6a992c3288b6f7a5d94172c9ad1908e71e58233e 15-Nov-2011 Ian Romanick <ian.d.romanick@intel.com> linker: Calculate the sampler to texture target mapping during linking

Track the calculated data in gl_shader_program instead of the
individual assembly shaders.

Signed-off-by: Ian Romanick <ian.d.romanick@intel.com>
Reviewed-by: Eric Anholt <eric@anholt.net>
Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
/external/mesa3d/src/mesa/main/uniforms.c
719909698c67c287a393d2380278e7b7495ae018 19-Oct-2011 Ian Romanick <ian.d.romanick@intel.com> mesa: Rewrite the way uniforms are tracked and handled

Switch all of the code in ir_to_mesa, st_glsl_to_tgsi, glUniform*,
glGetUniform, glGetUniformLocation, and glGetActiveUniforms to use the
gl_uniform_storage structures in the gl_shader_program.

A couple of notes:

* Like most rewrite-the-world patches, this should be reviewed by
applying the patch and examining the modified functions.

* This leaves a lot of dead code around in linker.cpp and
uniform_query.cpp. This will be deleted in the next patches.

v2: Update the comment block (previously a FINISHME) in _mesa_uniform
about generating GL_INVALID_VALUE when an out-of-range sampler index
is specified.

Signed-off-by: Ian Romanick <ian.d.romanick@intel.com>
Tested-by: Tom Stellard <thomas.stellard@amd.com>
/external/mesa3d/src/mesa/main/uniforms.c
70650d08fa3f4db2aea41e4ed47b271c3a3e7385 18-Oct-2011 Ian Romanick <ian.d.romanick@intel.com> mesa: Add _mesa_uniform_{attach,detach_all}_driver_storage functions

These functions are used to create and destroy the connections between
a uniform and the storage used by the driver to hold its value.

Signed-off-by: Ian Romanick <ian.d.romanick@intel.com>
Tested-by: Tom Stellard <thomas.stellard@amd.com>
/external/mesa3d/src/mesa/main/uniforms.c
2f45ed393a40e914749ddb86d41e0f77b2cea3da 13-Oct-2011 Ian Romanick <ian.d.romanick@intel.com> mesa: Move most of uniforms.c to uniform_query.cpp

Signed-off-by: Ian Romanick <ian.d.romanick@intel.com>
Tested-by: Tom Stellard <thomas.stellard@amd.com>
/external/mesa3d/src/mesa/main/uniforms.c
65add4327d786826d28c72ea34034df8137f65d9 14-Oct-2011 Ian Romanick <ian.d.romanick@intel.com> mesa: Refactor parameter validate for GetUniform, Uniform, and UniformMatrix

v2: Update a comment block about the different treatment of
location=-1 based on feedback from Ken.

Signed-off-by: Ian Romanick <ian.d.romanick@intel.com>
Tested-by: Tom Stellard <thomas.stellard@amd.com>
/external/mesa3d/src/mesa/main/uniforms.c
637a7eb9e981d7dbe3bdb0c39712a9183ea19e9c 13-Oct-2011 Ian Romanick <ian.d.romanick@intel.com> mesa: Move {split,merge}_location_offset to uniforms.h

Prepend _mesa_uniform_ to the names and rework the calling
convention. The calling convention was changed for a couple reasons.

1. Having a single variable named 'location' have completely different
meanings at different places in the function is confusing. Before
calling split_location_offset the location is the encoded value
returned by glGetUniformLocation. After calling split_location_offset
it's the index of the uniform in the gl_uniform_list::Uniforms array.

2. In a later commit the original value of 'location' is needed after
split_location_offset has been called.

Signed-off-by: Ian Romanick <ian.d.romanick@intel.com>
Tested-by: Tom Stellard <thomas.stellard@amd.com>
/external/mesa3d/src/mesa/main/uniforms.c
4ad41af616fed7ad0b6980f7181c9db9b95a6732 12-Oct-2011 Ian Romanick <ian.d.romanick@intel.com> mesa: Make get_uniform available outside compilation unit

Also rename to _mesa_get_uniform.

Signed-off-by: Ian Romanick <ian.d.romanick@intel.com>
Tested-by: Tom Stellard <thomas.stellard@amd.com>
/external/mesa3d/src/mesa/main/uniforms.c
fa7eccb8c0c590535856a54e3697982af6a630ed 12-Oct-2011 Ian Romanick <ian.d.romanick@intel.com> mesa: Move the link check from _mesa_get_uniform_location to _mesa_GetUniformLocationARB

There are cases where we might want to internally query the location
of a uniform in a shader that failed linking.

Signed-off-by: Ian Romanick <ian.d.romanick@intel.com>
Tested-by: Tom Stellard <thomas.stellard@amd.com>
/external/mesa3d/src/mesa/main/uniforms.c
0c87f16817ff0bf1f05e0d634944fd47b097faee 23-Oct-2011 Chia-I Wu <olv@lunarg.com> mesa: add support for GL_OES_EGL_image_external

This is an OpenGL ES specific extension. External textures are textures that
may be sampled from, but not be updated (no glTexSubImage* and etc.). The
image data are taken from an EGLImage.

Reviewed-by: Brian Paul <brianp@vmware.com>
Acked-by: Jakob Bornecrantz <jakob@vmware.com>
/external/mesa3d/src/mesa/main/uniforms.c
a541ff3fb99f43f9f664daf275e315af2836977e 07-Sep-2011 Ian Romanick <ian.d.romanick@intel.com> mesa: Move _mesa_GetActiveUniformARB to uniform_query.cpp

Fold _mesa_get_active_uniform into its only caller in the process.
More changes are coming soon.

Signed-off-by: Ian Romanick <ian.d.romanick@intel.com>
Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
/external/mesa3d/src/mesa/main/uniforms.c
0c76729f39bad667a4ee08ed76b51870ed9f6912 07-Sep-2011 Ian Romanick <ian.d.romanick@intel.com> mesa: Silence several 'warning: unused parameter' in _mesa_GetnUniformdvARB

This function isn't implemented yet, so none of its parameters are
used yet.

Signed-off-by: Ian Romanick <ian.d.romanick@intel.com>
Reviewed-by: Brian Paul <brianp@vmware.com>
Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
/external/mesa3d/src/mesa/main/uniforms.c
de772c402215b956ab3aa0875330fc1bf7cdf95b 21-Aug-2011 Ian Romanick <ian.d.romanick@intel.com> mesa: Use gl_shader_program::_LinkedShaders instead of FragmentProgram

Signed-off-by: Ian Romanick <ian.d.romanick@intel.com>
Reviewed-by: Brian Paul <brianp@vmware.com>
Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
/external/mesa3d/src/mesa/main/uniforms.c
39348bf79fb247eec895c93e52f23afe138be46a 20-Aug-2011 Ian Romanick <ian.d.romanick@intel.com> mesa: Use gl_shader_program::_LinkedShaders instead of GeometryProgram

Signed-off-by: Ian Romanick <ian.d.romanick@intel.com>
Reviewed-by: Brian Paul <brianp@vmware.com>
Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
/external/mesa3d/src/mesa/main/uniforms.c
010cc547ca8c1fb2107106b0ad0de560780ce9aa 20-Aug-2011 Ian Romanick <ian.d.romanick@intel.com> mesa: Use gl_shader_program::_LinkedShaders instead of VertexProgram

Signed-off-by: Ian Romanick <ian.d.romanick@intel.com>
Reviewed-by: Brian Paul <brianp@vmware.com>
Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
/external/mesa3d/src/mesa/main/uniforms.c
41f3773c1dc8e7a213ff7e730ada2cf48a60b209 14-Sep-2011 Dave Airlie <airlied@redhat.com> uniforms: accept all int/unsigned int sampler types in uniform checks.

I'm not 100% sure about this, it may need a version check or it might
be completely wrong.

added multisample ones as well.

Signed-off-by: Dave Airlie <airlied@redhat.com>
Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
/external/mesa3d/src/mesa/main/uniforms.c
4e64cfbb4ec92877803e70257af8b97c484c00c0 05-Sep-2011 Bryan Cain <bryancain3@gmail.com> mesa: add a UniformBooleanTrue option

Drivers supporting native integers set UniformBooleanTrue to the integer value
that should be used for true when uploading uniform booleans. This is ~0 for
Gallium and 1 for i965.

Reviewed-by: Ian Romanick <ian.d.romanick@intel.com>
/external/mesa3d/src/mesa/main/uniforms.c
9fa41f0742b7486e462e088a66bef8cebdf114f5 23-Aug-2011 Eric Anholt <eric@anholt.net> mesa: Fix glGetUniform() type conversions.

We were primarily failing to convert in the NativeIntegers case, which
this fixes. However, we were also just truncating float uniforms when
converting to integer, which does not appear to be the correct
behavior. Note, however, that the NVIDIA drivers also truncate
instead of rounding.

GL_DOUBLE return type is dropped because it was never used and
completely broken. It can be added when there's test code.

Fixes piglit ARB_shader_objects/getuniform

v2: This is a rewrite of my previous glGetUniform patch, which Ken
pointed out missed storage_type-based conversions to integer,
which was totally broken still thanks to a typo in the testcase.
v3: Quote the spec justifying the rounding behavior.

Acked-by: Kenneth Graunke <kenneth@whitecape.org>
Acked-by: Ian Romanick <ian.d.romanick@intel.com>
/external/mesa3d/src/mesa/main/uniforms.c
01d81dedc795005ed235856ce762bb1981655716 15-Aug-2011 Kenneth Graunke <kenneth@whitecape.org> mesa, glsl_to_tgsi: Add new gl_context::NativeIntegers flag.

Previously, native integer support was based on whether the driver
advertised GLSL 1.30 or not. However, drivers that natively support
integers may wish to do so for older GLSL versions as well. Adding this
new opt-in flag allows them to do so.

Currently disabled by default on all drivers, which was the existing
behavior (no drivers currently implement GLSL 1.30).

Fixes piglit tests on i965 with INTEL_GLSL_VERSION=130 set:
- spec/glsl-1.10/fs-uniform-int-110.shader_test
- spec/glsl-1.30/fs-uniform-int-130.shader_test
(it was doubly converting the data)

Signed-off-by: Kenneth Graunke <kenneth@whitecape.org>
Reviewed-by: Ian Romanick <ian.d.romanick@intel.com>
Reviewed-by: Eric Anholt <eric@anholt.net>
/external/mesa3d/src/mesa/main/uniforms.c
4683529048ee133481b2d8f1cae1685aa1736f9a 04-Aug-2011 Bryan Cain <bryancain3@gmail.com> Merge branch 'glsl-to-tgsi'

Conflicts:
src/mesa/state_tracker/st_atom_pixeltransfer.c
src/mesa/state_tracker/st_program.c
b191382c60bdcfeb7f424b23aa6ab63de81e2f08 14-Jun-2011 Bryan Cain <bryancain3@gmail.com> mesa, glsl_to_tgsi: add native support for integers in shaders

Disabled by default on all drivers. To enable it, change ctx->GLSLVersion to 130
in st_extensions.c. Currently, softpipe is the only driver with integer support.
/external/mesa3d/src/mesa/main/uniforms.c
6d89abadbcd68bbe9e08f041412549f8dc1fc73c 18-May-2011 Bryan Cain <bryancain3@gmail.com> mesa: support boolean and integer-based parameters in prog_parameter

The functionality is not used by anything yet, and the glUniform functions will
need to be reworked before this can reach its full usefulness. It is
nonetheless a step towards integer support in the state tracker and classic drivers.
/external/mesa3d/src/mesa/main/uniforms.c
86adc2b29effb573c18eb0de7016cef605ab1edc 04-Jul-2011 Henri Verbeet <hverbeet@gmail.com> mesa: Allow sampling from units >= MAX_TEXTURE_UNITS in shaders.

The total number of units used by a shader is limited to MAX_TEXTURE_UNITS,
but the actual indices are only limited by MAX_COMBINED_TEXTURE_IMAGE_UNITS,
since they're shared between vertex and fragment shaders.

NOTE: This is a candidate for the 7.11 branch.

Signed-off-by: Henri Verbeet <hverbeet@gmail.com>
Reviewed-by: Brian Paul <brianp@vmware.com>
Reviewed-by: Ian Romanick <ian.d.romanick@intel.com>
/external/mesa3d/src/mesa/main/uniforms.c
3d75c42bbf34c8a16de425da81b6fb02a8aa4b47 08-Jun-2011 Brian Paul <brianp@vmware.com> mesa: remove old comment
/external/mesa3d/src/mesa/main/uniforms.c
f9c2feb96b5854ca8030d94a5ea5b168ec818fe8 08-Jun-2011 Brian Paul <brianp@vmware.com> mesa: add more sampler types to is_sampler_type()
/external/mesa3d/src/mesa/main/uniforms.c
aaeb9a82162f7bfedcd3ecbe466599c6487b30a6 03-Jun-2011 Brian Paul <brianp@vmware.com> mesa: fix typo (s/GLGL/GLSL/)
/external/mesa3d/src/mesa/main/uniforms.c
52f6e79b7c5d220246fbb020006e628319b8c0c2 03-Jun-2011 Brian Paul <brianp@vmware.com> mesa: 80-column wrapping
/external/mesa3d/src/mesa/main/uniforms.c
9653acc52a1eb0b3187091b11f65470206cae6e6 03-Jun-2011 Brian Paul <brianp@vmware.com> mesa: consolidate glGetUniform code
/external/mesa3d/src/mesa/main/uniforms.c
bbce18c647a9113baec7b5b17435fcc4f9acb52e 03-Jun-2011 Brian Paul <brianp@vmware.com> mesa: refactor/consolidate uniform lookup code
/external/mesa3d/src/mesa/main/uniforms.c
d69dc2e20346397f4734a0760554a51fb4fbb3c0 31-May-2011 Marek Olšák <maraeo@gmail.com> mesa: UseShaderProgramEXT and Uniform* shouldn't be allowed inside Begin/End

I couldn't find this being required by the spec.

Reviewed-by: Brian Paul <brianp@vmware.com>
/external/mesa3d/src/mesa/main/uniforms.c
6b329b9274b18c50f4177eef7ee087d50ebc1525 26-Apr-2011 Brian Paul <brianp@vmware.com> Squashed commit of the following:

commit 864fe253b04105b7469e5f7b064dc37637b944f8
Author: Brian Paul <brianp@vmware.com>
Date: Thu Apr 21 20:13:07 2011 -0600

mesa: s/exec/disp/ in _mesa_init_histogram_dispatch()

This function isn't normally compiled (FEATURE_histogram).

commit f4bf45e2b94b582cacd19cdca873c5be627e4250
Author: nobled <nobled@dreamwidth.org>
Date: Thu Apr 21 07:53:58 2011 -0600

mesa: hook up GL_ARB_robustness dispatch functions

...and advertise the extension.

Signed-off-by: Brian Paul <brianp@vmware.com>

commit 2b89e38e5f572dc40cebc06381ae7c5d04386998
Author: nobled <nobled@dreamwidth.org>
Date: Thu Apr 21 07:53:58 2011 -0600

mesa: regenerated API files for GL_ARB_robustness

Signed-off-by: Brian Paul <brianp@vmware.com>

commit 5d5ebfb7135cec9d833adef86cbf4d0f3d9beca8
Author: nobled <nobled@dreamwidth.org>
Date: Thu Apr 21 07:53:57 2011 -0600

glapi: add ARB_robustness xml

Signed-off-by: Brian Paul <brianp@vmware.com>

commit 0159d1d6d99f4bbc18381dc2081c20d3aff17ac9
Author: nobled <nobled@dreamwidth.org>
Date: Thu Apr 21 07:53:57 2011 -0600

mesa: implement GL_ARB_robustness functions

Signed-off-by: Brian Paul <brianp@vmware.com>

commit 938fd71f4c4742f274922d53492a7290ab8d9c9b
Author: nobled <nobled@dreamwidth.org>
Date: Thu Apr 21 07:53:57 2011 -0600

mesa: add context fields for GL_ARB_robustness

Signed-off-by: Brian Paul <brianp@vmware.com>

commit 72075137bc79e65be03dac7e97b6dba93c3a86a4
Author: nobled <nobled@dreamwidth.org>
Date: Thu Apr 21 07:53:57 2011 -0600

mesa: standardize more bounds-checking error messages

Signed-off-by: Brian Paul <brianp@vmware.com>

commit 32a3fc23746db49da903fbc08afa0135af3007d2
Author: nobled <nobled@dreamwidth.org>
Date: Thu Apr 21 07:53:57 2011 -0600

mesa: standardize some bounds-checking error messages

Signed-off-by: Brian Paul <brianp@vmware.com>

commit cecbf1f4d164207de373dec0cadee2e84e1f9656
Author: nobled <nobled@dreamwidth.org>
Date: Thu Apr 21 07:53:57 2011 -0600

mesa: add more bounds-checking support for client memory buffers

Signed-off-by: Brian Paul <brianp@vmware.com>

commit edc895b52383d5bd274422db56adead1d81daf5f
Author: nobled <nobled@dreamwidth.org>
Date: Thu Apr 21 07:53:57 2011 -0600

mesa: add bounds-checking support for client memory buffers

Signed-off-by: Brian Paul <brianp@vmware.com>

commit 3a96ef28a538f158a219b406cd090dee70470c85
Author: nobled <nobled@dreamwidth.org>
Date: Thu Apr 21 07:53:57 2011 -0600

mesa: use is_bufferobj() helper function

Signed-off-by: Brian Paul <brianp@vmware.com>
/external/mesa3d/src/mesa/main/uniforms.c
92e412e788931ad464125113a64eec8a8223cda3 25-Jan-2011 Ian Romanick <ian.d.romanick@intel.com> glsl: Move _mesa_builtin_uniform_desc from uniforms.c to ir_variable.cpp

This array is going to be used in the main compiler soon. Leaving
them uniforms.c caused problems for building the stand-alone compiler.

Reviewed-by: Eric Anholt <eric@anholt.net>
Reviewed-by: Chad Versace <chad.versace@intel.com>
/external/mesa3d/src/mesa/main/uniforms.c
29e013e58be93aa6ed760393cf77ef34ca1d57c0 24-Nov-2010 Eric Anholt <eric@anholt.net> mesa: Add gl_MESAFogParamsOptimized for our special pre-computed fog params.

It would be nice if we handled optimized uniform math like this in
some generic way, since people often end up doing uniform expressions
in shaders, but for now keep this hard-coded like it was in the
texenvprogram code.
/external/mesa3d/src/mesa/main/uniforms.c
20f7a6f11aef492d5ca13e8ba9525eb2961d483c 12-Nov-2010 Eric Anholt <eric@anholt.net> mesa: Add a builtin uniform for the ATI_envmap_bumpmap rotation matrix.

For fixed function fragment processing in GLSL IR, we want to be able
to reference this state value. gl_* not explicitly permitted is
reserved, so using this variable name internally shouldn't be any
issue.
/external/mesa3d/src/mesa/main/uniforms.c
20d278a7ff0ce66e5c4ac437e1fbe52c31a1ecb3 27-Jan-2011 Ian Romanick <ian.d.romanick@intel.com> mesa: glGetUniform only returns a single element of an array

Also return it as the correct type. Previously the whole array would
be returned and each element would be expanded to a vec4.

Fixes piglit test getuniform-01 and bugzilla #29823.
/external/mesa3d/src/mesa/main/uniforms.c
2a7380e9c3a040356599a5b7740aa24e067fc1f5 05-Jan-2011 Jian Zhao <jian.j.zhao@intel.com> mesa: fix an error in uniform arrays in row calculating.

Fix the error in uniform row calculating, it may alloc one line
more which may cause out of range on memory usage, sometimes program
aborted when free the memory.

NOTE: This is a candidate for 7.9 and 7.10 branches.

Signed-off-by: Brian Paul <brianp@vmware.com>
/external/mesa3d/src/mesa/main/uniforms.c
db61b9ce39bccc43140357652ceb78baaf2aea44 07-Jan-2011 Vinson Lee <vlee@vmware.com> mesa: Directly include mfeatures.h in files that perform feature tests.
/external/mesa3d/src/mesa/main/uniforms.c
0117da40cd7edd3d165bb28569c289b37eca12b9 06-Jan-2011 Vinson Lee <vlee@vmware.com> mesa: Include mtypes.h in files that use gl_context struct.

Directly include mtypes.h if a file uses a gl_context struct. This
allows future removal of headers that are not strictly necessary but
indirectly include mtypes.h for a file.
/external/mesa3d/src/mesa/main/uniforms.c
9c61ca90eaf466211281eba6cacb243d4ed8db5b 29-Oct-2010 Brian Paul <brianp@vmware.com> mesa: add glGetUniformuiv(), plug in uint glUniform funcs
/external/mesa3d/src/mesa/main/uniforms.c
75c6f472880706dcbb9d1e20727fa8f71db8b11c 12-Oct-2010 Ian Romanick <ian.d.romanick@intel.com> mesa: Track an ActiveProgram distinct from CurrentProgram

ActiveProgram is the GL_EXT_separate_shader_objects state variable
used for glUniform calls. glUseProgram also sets this.
/external/mesa3d/src/mesa/main/uniforms.c
f9995b30756140724f41daf963fa06167912be7f 12-Oct-2010 Kristian Høgsberg <krh@bitplanet.net> Drop GLcontext typedef and use struct gl_context instead
/external/mesa3d/src/mesa/main/uniforms.c
a7cddd7de3123eb13e68c35aa111ff4060669f59 30-Sep-2010 Eric Anholt <eric@anholt.net> mesa: Don't reference a W component in setting up a vec3 uniform component.

The 965 driver would try to set up storage for the W component, and
the offsets would get mixed up.
/external/mesa3d/src/mesa/main/uniforms.c
daacaac3c8b91c87ab2cfc2d9f821474552b8181 29-Sep-2010 Eric Anholt <eric@anholt.net> mesa: Move the list of builtin uniform info from ir_to_mesa to shared code.

I'm still not pleased with how builtin uniforms are handled, but as
long as we're relying on the prog_statevar stuff this seems about as
good as it'll get.
/external/mesa3d/src/mesa/main/uniforms.c
2f5bf20e44d509fa3afbe2cfbb9bb65347daea6a 25-Aug-2010 Eric Anholt <eric@anholt.net> glsl: Set up uniform initializers by walking the shaders after linking.

Previously, uniform initializers were handled by ir_to_mesa as it made
its Parameters list. However, uniform values are global to all
shaders, and the value set in one Parameters list wasn't propagated to
the other gl_program->Parameters lists. By going back through the
general Mesa uniform handling, we make sure that all gl_programs get
updated values, and also successfully separate uniform initializer
handling from ir_to_mesa gl_program generation.

Fixes:
glsl-uniform-initializer-5.
/external/mesa3d/src/mesa/main/uniforms.c
79b643dd02ac4e19f24c9cd88843719746f8ec69 11-Jul-2010 Zack Rusin <zackr@vmware.com> mesa: make uniform work with geometry shaders
/external/mesa3d/src/mesa/main/uniforms.c
40ef298641046d0455df9e177b14d33ba618f466 03-Jul-2010 Chia-I Wu <olv@lunarg.com> mesa: Fix OpenGL ES-only builds.

Check FEATURE_GL in _mesa_init_shader_dispatch and
_mesa_init_shader_uniform_dispatch. OpenGL ES can not and does not use
_mesa_init_<...>_dispatch. This is supposed to be temporary. Ideally,
a more flexible way for initializing dispatch tables should be
developed.
/external/mesa3d/src/mesa/main/uniforms.c
da7bd6a90e1fee5c16327338fd251c0f6be34e36 28-Jun-2010 Zack Rusin <zackr@vmware.com> mesa: initial support for ARB_geometry_shader4

laying down the foundation for everything and implementing most of the
stuff.
linking, gl_VerticesIn and multidimensional inputs are left.
/external/mesa3d/src/mesa/main/uniforms.c
ec2b92f98c2e7f161521b447cc1d9a36bce3707c 11-Jun-2010 Brian Paul <brianp@vmware.com> mesa: rename src/mesa/shader/ to src/mesa/program/
/external/mesa3d/src/mesa/main/uniforms.c
936605fc8a69f67de323e5ede60c2f1373bfcafe 11-Jun-2010 Brian Paul <brianp@vmware.com> mesa: move uniforms.c to main/
/external/mesa3d/src/mesa/main/uniforms.c