| Commit message (Collapse) | Author | Age | Files | Lines |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
This writes linked shader programs to .shader_test files to
$MESA_SHADER_CAPTURE_PATH in the format used by shader-db
(http://cgit.freedesktop.org/mesa/shader-db).
It supports both GLSL shaders and ARB programs. All stages that
are linked together are written in a single .shader_test file.
This eliminates the need for shader-db's split-to-files.py, as Mesa
produces the desired format directly. It's much more reliable than
parsing stdout/stderr, as those may contain extraneous messages, or
simply be closed by the application and unavailable.
We have many similar features already, but this is a bit different:
- MESA_GLSL=dump writes to stdout, not files.
- MESA_GLSL=log writes each stage to separate files (rather than
all linked shaders in one file), at draw time (not link time),
with uniform data and state flag info.
- Tapani's shader replacement mechanism (MESA_SHADER_DUMP_PATH and
MESA_SHADER_READ_PATH) also uses separate files per shader stage,
but allows reading in files to replace an app's shader code.
v2: Dump ARB programs too, not just GLSL.
v3: Don't dump bogus 0.shader_test file.
v4: Add "GL_ARB_separate_shader_objects" to the [require] block.
v5: Print "GLSL 4.00" instead of "GLSL 4.0" in the [require] block.
v6: Don't hardcode /tmp/mesa.
v7: Fix memoization of getenv().
v8: Also print "SSO ENABLED" (suggested by Timothy).
v9: Also handle ES shaders (suggested by Ilia).
v10: Guard against MESA_SHADER_CAPTURE_PATH being too long; add
_mesa_warning calls on error handling (suggested by Ben).
v11: Fix crash when variable is unset introduced in v10.
Signed-off-by: Kenneth Graunke <[email protected]>
Reviewed-by: Matt Turner <[email protected]>
|
|
|
|
|
|
|
|
| |
This will allow me to use them directly from Meta, bypassing the
versions that work with GL integer handles.
Signed-off-by: Kenneth Graunke <[email protected]>
Reviewed-by: Timothy Arceri <[email protected]>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
main/api_exec.c:543:36: warning: incompatible pointer types passing 'void (GLhandleARB, GLuint, const GLcharARB *)' (aka 'void (unsigned long, unsigned int, const char *)') to
parameter of
type 'void (*)(GLuint, GLuint, const GLchar *)' (aka 'void (*)(unsigned int, unsigned int, const char *)') [-Wincompatible-pointer-types]
SET_BindAttribLocation(exec, _mesa_BindAttribLocation);
^~~~~~~~~~~~~~~~~~~~~~~~
./main/dispatch.h:7590:88: note: passing argument to parameter 'fn' here
static inline void SET_BindAttribLocation(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, GLuint, const GLchar *)) {
^
main/api_exec.c:547:31: warning: incompatible pointer types passing 'void (GLhandleARB)' (aka 'void (unsigned long)') to parameter of type 'void (*)(GLuint)' (aka 'void (*)(unsigned
int)')
[-Wincompatible-pointer-types]
SET_CompileShader(exec, _mesa_CompileShader);
^~~~~~~~~~~~~~~~~~~
./main/dispatch.h:7612:83: note: passing argument to parameter 'fn' here
static inline void SET_CompileShader(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint)) {
^
main/api_exec.c:568:33: warning: incompatible pointer types passing 'void (GLhandleARB, GLuint, GLsizei, GLsizei *, GLint *, GLenum *, GLcharARB *)' (aka 'void (unsigned long,
unsigned int,
int, int *, int *, unsigned int *, char *)') to parameter of type 'void (*)(GLuint, GLuint, GLsizei, GLsizei *, GLint *, GLenum *, GLchar *)' (aka 'void (*)(unsigned int,
unsigned int,
int, int *, int *, unsigned int *, char *)') [-Wincompatible-pointer-types]
SET_GetActiveAttrib(exec, _mesa_GetActiveAttrib);
^~~~~~~~~~~~~~~~~~~~~
./main/dispatch.h:7711:85: note: passing argument to parameter 'fn' here
static inline void SET_GetActiveAttrib(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, GLuint, GLsizei , GLsizei *, GLint *, GLenum *, GLchar *)) {
^
main/api_exec.c:571:35: warning: incompatible pointer types passing 'GLint (GLhandleARB, const GLcharARB *)' (aka 'int (unsigned long, const char *)') to parameter of type
'GLint (*)(GLuint, const GLchar *)' (aka 'int (*)(unsigned int, const char *)') [-Wincompatible-pointer-types]
SET_GetAttribLocation(exec, _mesa_GetAttribLocation);
^~~~~~~~~~~~~~~~~~~~~~~
./main/dispatch.h:7744:88: note: passing argument to parameter 'fn' here
static inline void SET_GetAttribLocation(struct _glapi_table *disp, GLint (GLAPIENTRYP fn)(GLuint, const GLchar *)) {
^
main/api_exec.c:585:33: warning: incompatible pointer types passing 'void (GLhandleARB, GLsizei, GLsizei *, GLcharARB *)' (aka 'void (unsigned long, int, int *, char *)') to
parameter of
type 'void (*)(GLuint, GLsizei, GLsizei *, GLchar *)' (aka 'void (*)(unsigned int, int, int *, char *)') [-Wincompatible-pointer-types]
SET_GetShaderSource(exec, _mesa_GetShaderSource);
^~~~~~~~~~~~~~~~~~~~~
./main/dispatch.h:7788:85: note: passing argument to parameter 'fn' here
static inline void SET_GetShaderSource(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, GLsizei, GLsizei *, GLchar *)) {
^
main/api_exec.c:597:29: warning: incompatible pointer types passing 'void (GLhandleARB)' (aka 'void (unsigned long)') to parameter of type 'void (*)(GLuint)' (aka 'void (*)(unsigned
int)')
[-Wincompatible-pointer-types]
SET_LinkProgram(exec, _mesa_LinkProgram);
^~~~~~~~~~~~~~~~~
./main/dispatch.h:7909:81: note: passing argument to parameter 'fn' here
static inline void SET_LinkProgram(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint)) {
^
main/api_exec.c:628:30: warning: incompatible pointer types passing 'void (GLhandleARB, GLsizei, const GLcharARB *const *, const GLint *)' (aka
'void (unsigned long, int, const char *const *, const int *)') to parameter of type 'void (*)(GLuint, GLsizei, const GLchar *const *, const GLint *)' (aka 'void (*)(unsigned
int, int,
const char *const *, const int *)') [-Wincompatible-pointer-types]
SET_ShaderSource(exec, _mesa_ShaderSource);
^~~~~~~~~~~~~~~~~~
./main/dispatch.h:7920:82: note: passing argument to parameter 'fn' here
static inline void SET_ShaderSource(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, GLsizei, const GLchar * const *, const GLint *)) {
^
main/api_exec.c:653:28: warning: incompatible pointer types passing 'void (GLhandleARB)' (aka 'void (unsigned long)') to parameter of type 'void (*)(GLuint)' (aka 'void (*)(unsigned
int)')
[-Wincompatible-pointer-types]
SET_UseProgram(exec, _mesa_UseProgram);
^~~~~~~~~~~~~~~~
./main/dispatch.h:8173:80: note: passing argument to parameter 'fn' here
static inline void SET_UseProgram(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint)) {
^
main/api_exec.c:655:33: warning: incompatible pointer types passing 'void (GLhandleARB)' (aka 'void (unsigned long)') to parameter of type 'void (*)(GLuint)' (aka 'void (*)(unsigned
int)')
[-Wincompatible-pointer-types]
SET_ValidateProgram(exec, _mesa_ValidateProgram);
^~~~~~~~~~~~~~~~~~~~~
./main/dispatch.h:8184:85: note: passing argument to parameter 'fn' here
static inline void SET_ValidateProgram(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint)) {
main/dlist.c:9457:26: warning: incompatible pointer types passing 'void (GLhandleARB)' (aka 'void (unsigned long)') to parameter of type 'void (*)(GLuint)' (aka 'void (*)(unsigned
int)')
[-Wincompatible-pointer-types]
SET_UseProgram(table, save_UseProgramObjectARB);
^~~~~~~~~~~~~~~~~~~~~~~~
./main/dispatch.h:8173:80: note: passing argument to parameter 'fn' here
static inline void SET_UseProgram(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint)) {
^
1 warning generated.
Signed-off-by: Jeremy Huddleston Sequoia <[email protected]>
Reviewed-by: Nicolai Hähnle <[email protected]>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Patch also refactors name length queries which were using array size
in computation, this has to be done in same time to avoid regression in
arb_program_interface_query-resource-query Piglit test.
Fixes rest of the failures with
ES31-CTS.program_interface_query.no-locations
v2: make additional check only for GS inputs
v3: create helper function for resource name length
so that it gets calculated only in one place
Signed-off-by: Tapani Pälli <[email protected]>
Reviewed-by: Martin Peres <[email protected]>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
This removes the need for multiple functions designed to validate an array
subscript and replaces them with a call to a single function.
The change also means that validation is now only done once and the index
is retrived at the same time, as a result the getUniformLocation code can
be simplified saving an extra hash table lookup (and yet another
validation call).
This chage also fixes some tests in:
ES31-CTS.program_interface_query.uniform
V3: rebase on subroutines, and move the resource index array == 0
check into _mesa_GetProgramResourceIndex() to simplify things further
V2: Fix bounds checks for program input/output, split unrelated comment fix
and _mesa_get_uniform_location() removal into their own patch.
Cc: Tapani Pälli <[email protected]>
Reviewed-by: Tapani Pälli <[email protected]>
|
|
|
|
|
|
|
|
|
|
| |
This fleshes out the APIs, using the program resource
APIs where they should match.
It also sets the default values to valid subroutines.
Acked-by: Kenneth Graunke <[email protected]>
Signed-off-by: Dave Airlie <[email protected]>
|
|
|
|
|
|
|
| |
Reviewed-by: Tapani Pälli <[email protected]>
Reviewed-by: Kenneth Graunke <[email protected]>
Signed-off-by: Chris Forbes <[email protected]>
Signed-off-by: Dave Airlie <[email protected]>
|
|
|
|
|
|
|
| |
Reviewed-by: Jordan Justen <[email protected]>
Reviewed-by: Matt Turner <[email protected]>
Reviewed-by: Ian Romanick <[email protected]>
Reviewed-by: Kenneth Graunke <[email protected]>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
`interface` is a define on Windows -- an alias for `struct` keyword,
used when declaring COM interfaces in C or C++.
So use instead `programInterface`, therefore matching the name used
in GL_ARB_program_interface_query spec/headers, which was renamed exactly
for the same reason:
"Revision 10, May 10, 2012 (pbrown)
- Rename the formal parameter <interface> used by the functions in this
extension to <programInterface>. Certain versions of the Microsoft
C/C++ compiler and/or its headers cause "interface" to be treated as a
reserved keyword."
Trivial.
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Patch adds required helper functions to shaderapi.h and
the actual implementation.
The property query functionality can be tested with tests for
following functions that are refactored by later patches:
GetActiveAtomicCounterBufferiv
GetActiveUniformBlockiv
GetActiveUniformsiv
v2: code cleanup (Ilia Mirkin)
add bufSize < 0 check and error out
fix is_resource_referenced to return bool
check for propCount and bufSize, fixes in buffer_prop
Signed-off-by: Tapani Pälli <[email protected]>
Reviewed-by: Martin Peres <[email protected]>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Patch adds required helper functions to shaderapi.h and
the actual implementation.
The added functionality can be tested by tests for following
functions that are refactored by later patches:
GetFragDataIndex
v2: return -1 if output not referenced by fragment stage
(Ilia Mirkin)
Signed-off-by: Tapani Pälli <[email protected]>
Reviewed-by: Martin Peres <[email protected]>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Patch adds required helper functions to shaderapi.h and
the actual implementation.
corresponding Piglit test:
arb_program_interface_query-resource-location
The added functionality can be tested by tests for following
functions that are refactored by later patches:
GetAttribLocation
GetUniformLocation
GetFragDataLocation
v2: code cleanup, changes to array element
syntax checking (Ilia Mirkin)
Signed-off-by: Tapani Pälli <[email protected]>
Reviewed-by: Martin Peres <[email protected]>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Patch adds required helper functions to shaderapi.h and
the actual implementation.
Name generation copied from '_mesa_get_uniform_name' which can
be removed later by refactoring functions to use resource list.
The added functionality can be tested by tests for following
functions that are refactored by later patches:
GetActiveUniformName
GetActiveUniformBlockName
v2: no index for geometry shader inputs (Ilia Mirkin)
add bufSize < 0 check and error out
validate enum
corresponding Piglit test:
arb_program_interface_query-getprogramresourcename
Signed-off-by: Tapani Pälli <[email protected]>
Reviewed-by: Martin Peres <[email protected]>
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Patch adds required helper functions to shaderapi.h and
the actual implementation.
v2: code cleanup (Ilia Mirkin)
corresponding Piglit test:
arb_program_interface_query-getprogramresourceindex
Signed-off-by: Tapani Pälli <[email protected]>
Reviewed-by: Martin Peres <[email protected]>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Patch adds required helper functions to shaderapi.h and
the actual implementation.
v2: code cleanup (Ilia Mirkin)
fix array size fo xfb varyings
validate programInterface and throw error
v3: put GL_MAX_NUM_COMPATIBLE_SUBROUTINES where
it belongs
corresponding Piglit test:
arb_program_interface_query-getprograminterfaceiv
Signed-off-by: Tapani Pälli <[email protected]>
Reviewed-by: Martin Peres <[email protected]>
|
|
|
|
|
|
|
|
|
|
|
| |
_mesa_UseShaderProgramEXT, _mesa_ActiveProgramEXT, and
_mesa_CreateShaderProgramEXT were all removed when support for
GL_EXT_separate_shader_objects was removed.
Signed-off-by: Ian Romanick <[email protected]>
Reviewed-by: Brian Paul <[email protected]>
Reviewed-by: Matt Turner <[email protected]>
Reviewed-by: Kenneth Graunke <[email protected]>
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Extend use_shader_program to support a different target. Allow to reuse the
function to update the pipeline state. Note I bypass the flush when target
isn't current. Maybe it would be better to create a new UseProgramStages
driver function
This was originally included in another patch, but it was split out by
Ian Romanick.
Reviewed-by: Ian Romanick <[email protected]>
Reviewed-by: Eric Anholt <[email protected]>
|
|
|
|
|
|
|
|
|
|
| |
Future patches will use this function outside shaderapi.c.
This was originally included in another patch, but it was split out by
Ian Romanick.
Reviewed-by: Ian Romanick <[email protected]>
Reviewed-by: Jordan Justen <[email protected]>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Nothings implemented yet but glProgramUniform* which are mostly a
copy/paste of the older function glUniform*
I create dedicated pipelineobj.[ch] file that will contains function
related to the "new" pipeline container object.
V2: formatting improvement
V3:
* indentation fix
* Update copyright
* Add a comment on ProgramParameteri already present in another extension
* Remove TODO, will be readded on correct patch
V4 (idr):
* Fix dispatch_sanity unit test
* Make extension string available in core profiles (instead of just
compatibility).
* Trivial reformating
Reviewed-by: Ian Romanick <[email protected]>
Reviewed-by: Jordan Justen <[email protected]>
|
|
|
|
|
| |
Reviewed-by: Chris Forbes <[email protected]>
Reviewed-by: Brian Paul <[email protected]>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Previously, we had an enum called gl_shader_type which represented
pipeline stages in the order they occur in the pipeline
(i.e. MESA_SHADER_VERTEX=0, MESA_SHADER_GEOMETRY=1, etc), and several
inconsistently named functions for converting between it and other
representations:
- _mesa_shader_type_to_string: gl_shader_type -> string
- _mesa_shader_type_to_index: GLenum (GL_*_SHADER) -> gl_shader_type
- _mesa_program_target_to_index: GLenum (GL_*_PROGRAM) -> gl_shader_type
- _mesa_shader_enum_to_string: GLenum (GL_*_{SHADER,PROGRAM}) -> string
This patch tries to clean things up so that we use more consistent
terminology: the enum is now called gl_shader_stage (to emphasize that
it is in the order of pipeline stages), and the conversion functions are:
- _mesa_shader_stage_to_string: gl_shader_stage -> string
- _mesa_shader_enum_to_shader_stage: GLenum (GL_*_SHADER) -> gl_shader_stage
- _mesa_program_enum_to_shader_stage: GLenum (GL_*_PROGRAM) -> gl_shader_stage
- _mesa_progshader_enum_to_string: GLenum (GL_*_{SHADER,PROGRAM}) -> string
In addition, MESA_SHADER_TYPES has been renamed to MESA_SHADER_STAGES,
for consistency with the new name for the enum.
Reviewed-by: Kenneth Graunke <[email protected]>
v2: Also rename the "target" field of _mesa_glsl_parse_state and the
"target" parameter of _mesa_shader_stage_to_string to "stage".
Reviewed-by: Brian Paul <[email protected]>
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
This patch creates a single function to copy the the UsesClipDistance
flag from gl_shader_program.Vert to gl_vertex_program. Previously
this logic was duplicated in the i965-specific function
brw_link_shader() and the core mesa function _mesa_ir_link_shader().
This logic will have to be expanded to support geometry shaders, and I
don't want to have to update it in two separate places.
Reviewed-by: Ian Romanick <[email protected]>
Reviewed-by: Kenneth Graunke <[email protected]>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
The previous commit introduced extra words, breaking the formatting.
This text transformation was done automatically via the following shell
command:
$ git grep 'THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY' | sed 's/:.*$//' | xargs -I {} sh -c 'vim -e -s {} < vimscript
where 'vimscript' is a file containing:
/THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY/;/\*\// !fmt -w 78 -p ' * '
:wq
Reviewed-by: Brian Paul <[email protected]>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
This brings the license text in line with the MIT License as published
on the Open Source Initiative website:
http://opensource.org/licenses/mit-license.php
Generated automatically be the following shell command:
$ git grep 'THE AUTHORS BE LIABLE' | sed 's/:.*$//g' | xargs -I '{}' \
sed -i 's/THE AUTHORS/THE AUTHORS OR COPYRIGHT HOLDERS/' {}
This introduces some wrapping issues, to be fixed in the next commit.
Reviewed-by: Brian Paul <[email protected]>
|
|
|
|
|
|
|
|
| |
This cuts out a ton of code to make functions not set to a save_ variant
match.
Reviewed-by: Brian Paul <[email protected]>
Reviewed-by: Ian Romanick <[email protected]>
|
|
|
|
|
| |
Signed-off-by: Ian Romanick <[email protected]>
Reviewed-by: Kenneth Graunke <[email protected]>
|
|
|
|
|
|
|
|
| |
After recent changes in the XML, the dispatch generators will expect
this function to be named _mesa_ProgramParameteri.
Signed-off-by: Ian Romanick <[email protected]>
Reviewed-by: Kenneth Graunke <[email protected]>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
This patch changes the use of const in the type signatures of
_mesa_ShaderSource() and _mesa_TransformFeedbackVaryings(), to match
the type signatures in the GL spec. This avoids warnings when
building the code-generated api_exec.c file.
Note: previously we avoided the build warnings because these functions
were being type-checked against ShaderSourceARB and
TransformFeedbackVaryingsEXT; those functions are semantically
equivalent, but have fewer const qualifiers in their type signatures.
Acked-by: Brian Paul <[email protected]>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
This patch adjusts the aliasing pattern in the GL API description XML,
and the functions that implement the GL API within Mesa, to
consistently follow these naming conventions:
- When several function names are aliases of each other, the primary
name is the one with no extension suffix (or the name with the
suffix "ARB", if no unsuffixed name is available). (By "primary
name", I mean the name that all the other functions point to using
the XML "alias" attribute).
- The name of the mesa implementation of each function is the same as
the primary name, with the prefix "_mesa_".
This patch renames the following mesa functions:
_check_GetTexGenxvOES => _mesa_GetTexGenxvOES
_check_TexGenxOES => _mesa_TexGenxOES
_check_TexGenxvOES => _mesa_TexGenxvOES
_es_AlphaFuncx => _mesa_AlphaFuncx
_es_ClearColorx => _mesa_ClearColorx
_es_ClearDepthx => _mesa_ClearDepthx
_es_ClipPlanef => _mesa_ClipPlanef
_es_ClipPlanex => _mesa_ClipPlanex
_es_Color4x => _mesa_Color4x
_es_DepthRangex => _mesa_DepthRangex
_es_DrawTexxOES => _mesa_DrawTexxOES
_es_DrawTexxvOES => _mesa_DrawTexxvOES
_es_Fogx => _mesa_Fogx
_es_Fogxv => _mesa_Fogxv
_es_Frustumf => _mesa_Frustumf
_es_Frustumx => _mesa_Frustumx
_es_GetClipPlanef => _mesa_GetClipPlanef
_es_GetClipPlanex => _mesa_GetClipPlanex
_es_GetLightxv => _mesa_GetLightxv
_es_GetMaterialxv => _mesa_GetMaterialxv
_es_GetTexEnvxv => _mesa_GetTexEnvxv
_es_GetTexParameterxv => _mesa_GetTexParameterxv
_es_LightModelx => _mesa_LightModelx
_es_LightModelxv => _mesa_LightModelxv
_es_Lightx => _mesa_Lightx
_es_Lightxv => _mesa_Lightxv
_es_LineWidthx => _mesa_LineWidthx
_es_LoadMatrixx => _mesa_LoadMatrixx
_es_Materialx => _mesa_Materialx
_es_Materialxv => _mesa_Materialxv
_es_MultMatrixx => _mesa_MultMatrixx
_es_MultiTexCoord4x => _mesa_MultiTexCoord4x
_es_Normal3x => _mesa_Normal3x
_es_Orthof => _mesa_Orthof
_es_Orthox => _mesa_Orthox
_es_PointParameterx => _mesa_PointParameterx
_es_PointParameterxv => _mesa_PointParameterxv
_es_PointSizex => _mesa_PointSizex
_es_PolygonOffsetx => _mesa_PolygonOffsetx
_es_QueryMatrixxOES => _mesa_QueryMatrixxOES
_es_Rotatex => _mesa_Rotatex
_es_SampleCoveragex => _mesa_SampleCoveragex
_es_Scalex => _mesa_Scalex
_es_TexEnvx => _mesa_TexEnvx
_es_TexEnvxv => _mesa_TexEnvxv
_es_TexParameterx => _mesa_TexParameterx
_es_TexParameterxv => _mesa_TexParameterxv
_es_Translatex => _mesa_Translatex
_mesa_ActiveTextureARB => _mesa_ActiveTexture
_mesa_BeginQueryARB => _mesa_BeginQuery
_mesa_BindAttribLocationARB => _mesa_BindAttribLocation
_mesa_BindBufferARB => _mesa_BindBuffer
_mesa_BindFramebufferEXT => _mesa_BindFramebuffer
_mesa_BindProgram => _mesa_BindProgramARB
_mesa_BindRenderbufferEXT => _mesa_BindRenderbuffer
_mesa_BlendEquationSeparateEXT => _mesa_BlendEquationSeparate
_mesa_BlendEquationSeparatei => _mesa_BlendEquationSeparateiARB
_mesa_BlendEquationi => _mesa_BlendEquationiARB
_mesa_BlendFuncSeparateEXT => _mesa_BlendFuncSeparate
_mesa_BlendFuncSeparatei => _mesa_BlendFuncSeparateiARB
_mesa_BlendFunci => _mesa_BlendFunciARB
_mesa_BlitFramebufferEXT => _mesa_BlitFramebuffer
_mesa_BufferDataARB => _mesa_BufferData
_mesa_BufferSubDataARB => _mesa_BufferSubData
_mesa_CheckFramebufferStatusEXT => _mesa_CheckFramebufferStatus
_mesa_ClampColorARB => _mesa_ClampColor
_mesa_ClientActiveTextureARB => _mesa_ClientActiveTexture
_mesa_ColorMaskIndexed => _mesa_ColorMaski
_mesa_CompileShaderARB => _mesa_CompileShader
_mesa_CompressedTexImage1DARB => _mesa_CompressedTexImage1D
_mesa_CompressedTexImage2DARB => _mesa_CompressedTexImage2D
_mesa_CompressedTexImage3DARB => _mesa_CompressedTexImage3D
_mesa_CompressedTexSubImage1DARB => _mesa_CompressedTexSubImage1D
_mesa_CompressedTexSubImage2DARB => _mesa_CompressedTexSubImage2D
_mesa_CompressedTexSubImage3DARB => _mesa_CompressedTexSubImage3D
_mesa_DeleteBuffersARB => _mesa_DeleteBuffers
_mesa_DeleteFramebuffersEXT => _mesa_DeleteFramebuffers
_mesa_DeletePrograms => _mesa_DeleteProgramsARB
_mesa_DeleteQueriesARB => _mesa_DeleteQueries
_mesa_DeleteRenderbuffersEXT => _mesa_DeleteRenderbuffers
_mesa_DeleteVertexArraysAPPLE => _mesa_DeleteVertexArrays
_mesa_DisableIndexed => _mesa_Disablei
_mesa_DisableVertexAttribArrayARB => _mesa_DisableVertexAttribArray
_mesa_DrawBuffersARB => _mesa_DrawBuffers
_mesa_DrawTexf => _mesa_DrawTexfOES
_mesa_DrawTexfv => _mesa_DrawTexfvOES
_mesa_DrawTexi => _mesa_DrawTexiOES
_mesa_DrawTexiv => _mesa_DrawTexivOES
_mesa_DrawTexs => _mesa_DrawTexsOES
_mesa_DrawTexsv => _mesa_DrawTexsvOES
_mesa_EnableIndexed => _mesa_Enablei
_mesa_EnableVertexAttribArrayARB => _mesa_EnableVertexAttribArray
_mesa_EndQueryARB => _mesa_EndQuery
_mesa_FogCoordPointerEXT => _mesa_FogCoordPointer
_mesa_FramebufferRenderbufferEXT => _mesa_FramebufferRenderbuffer
_mesa_FramebufferTexture1DEXT => _mesa_FramebufferTexture1D
_mesa_FramebufferTexture2DEXT => _mesa_FramebufferTexture2D
_mesa_FramebufferTexture3DEXT => _mesa_FramebufferTexture3D
_mesa_FramebufferTextureLayerEXT => _mesa_FramebufferTextureLayer
_mesa_GenBuffersARB => _mesa_GenBuffers
_mesa_GenFramebuffersEXT => _mesa_GenFramebuffers
_mesa_GenPrograms => _mesa_GenProgramsARB
_mesa_GenQueriesARB => _mesa_GenQueries
_mesa_GenRenderbuffersEXT => _mesa_GenRenderbuffers
_mesa_GenerateMipmapEXT => _mesa_GenerateMipmap
_mesa_GetActiveAttribARB => _mesa_GetActiveAttrib
_mesa_GetActiveUniformARB => _mesa_GetActiveUniform
_mesa_GetAttribLocationARB => _mesa_GetAttribLocation
_mesa_GetBooleanIndexedv => _mesa_GetBooleani_v
_mesa_GetBufferParameterivARB => _mesa_GetBufferParameteriv
_mesa_GetBufferPointervARB => _mesa_GetBufferPointerv
_mesa_GetBufferSubDataARB => _mesa_GetBufferSubData
_mesa_GetCompressedTexImageARB => _mesa_GetCompressedTexImage
_mesa_GetFramebufferAttachmentParameterivEXT => _mesa_GetFramebufferAttachmentParameteriv
_mesa_GetIntegerIndexedv => _mesa_GetIntegeri_v
_mesa_GetQueryObjecti64vEXT => _mesa_GetQueryObjecti64v
_mesa_GetQueryObjectivARB => _mesa_GetQueryObjectiv
_mesa_GetQueryObjectui64vEXT => _mesa_GetQueryObjectui64v
_mesa_GetQueryObjectuivARB => _mesa_GetQueryObjectuiv
_mesa_GetQueryivARB => _mesa_GetQueryiv
_mesa_GetRenderbufferParameterivEXT => _mesa_GetRenderbufferParameteriv
_mesa_GetShaderSourceARB => _mesa_GetShaderSource
_mesa_GetUniformLocationARB => _mesa_GetUniformLocation
_mesa_GetUniformfvARB => _mesa_GetUniformfv
_mesa_GetUniformivARB => _mesa_GetUniformiv
_mesa_GetVertexAttribPointervARB => _mesa_GetVertexAttribPointerv
_mesa_GetVertexAttribdvARB => _mesa_GetVertexAttribdv
_mesa_GetVertexAttribfvARB => _mesa_GetVertexAttribfv
_mesa_GetVertexAttribivARB => _mesa_GetVertexAttribiv
_mesa_IsBufferARB => _mesa_IsBuffer
_mesa_IsEnabledIndexed => _mesa_IsEnabledi
_mesa_IsFramebufferEXT => _mesa_IsFramebuffer
_mesa_IsQueryARB => _mesa_IsQuery
_mesa_IsRenderbufferEXT => _mesa_IsRenderbuffer
_mesa_IsVertexArrayAPPLE => _mesa_IsVertexArray
_mesa_LinkProgramARB => _mesa_LinkProgram
_mesa_LoadTransposeMatrixdARB => _mesa_LoadTransposeMatrixd
_mesa_LoadTransposeMatrixfARB => _mesa_LoadTransposeMatrixf
_mesa_MapBufferARB => _mesa_MapBuffer
_mesa_MultTransposeMatrixdARB => _mesa_MultTransposeMatrixd
_mesa_MultTransposeMatrixfARB => _mesa_MultTransposeMatrixf
_mesa_MultiDrawArraysEXT => _mesa_MultiDrawArrays
_mesa_PointSizePointer => _mesa_PointSizePointerOES
_mesa_ProvokingVertexEXT => _mesa_ProvokingVertex
_mesa_RenderbufferStorageEXT => _mesa_RenderbufferStorage
_mesa_SampleCoverageARB => _mesa_SampleCoverage
_mesa_SecondaryColorPointerEXT => _mesa_SecondaryColorPointer
_mesa_ShaderSourceARB => _mesa_ShaderSource
_mesa_Uniform1fARB => _mesa_Uniform1f
_mesa_Uniform1fvARB => _mesa_Uniform1fv
_mesa_Uniform1iARB => _mesa_Uniform1i
_mesa_Uniform1ivARB => _mesa_Uniform1iv
_mesa_Uniform2fARB => _mesa_Uniform2f
_mesa_Uniform2fvARB => _mesa_Uniform2fv
_mesa_Uniform2iARB => _mesa_Uniform2i
_mesa_Uniform2ivARB => _mesa_Uniform2iv
_mesa_Uniform3fARB => _mesa_Uniform3f
_mesa_Uniform3fvARB => _mesa_Uniform3fv
_mesa_Uniform3iARB => _mesa_Uniform3i
_mesa_Uniform3ivARB => _mesa_Uniform3iv
_mesa_Uniform4fARB => _mesa_Uniform4f
_mesa_Uniform4fvARB => _mesa_Uniform4fv
_mesa_Uniform4iARB => _mesa_Uniform4i
_mesa_Uniform4ivARB => _mesa_Uniform4iv
_mesa_UniformMatrix2fvARB => _mesa_UniformMatrix2fv
_mesa_UniformMatrix3fvARB => _mesa_UniformMatrix3fv
_mesa_UniformMatrix4fvARB => _mesa_UniformMatrix4fv
_mesa_UnmapBufferARB => _mesa_UnmapBuffer
_mesa_UseProgramObjectARB => _mesa_UseProgram
_mesa_ValidateProgramARB => _mesa_ValidateProgram
_mesa_VertexAttribPointerARB => _mesa_VertexAttribPointer
_mesa_WindowPos2dMESA => _mesa_WindowPos2d
_mesa_WindowPos2dvMESA => _mesa_WindowPos2dv
_mesa_WindowPos2fMESA => _mesa_WindowPos2f
_mesa_WindowPos2fvMESA => _mesa_WindowPos2fv
_mesa_WindowPos2iMESA => _mesa_WindowPos2i
_mesa_WindowPos2ivMESA => _mesa_WindowPos2iv
_mesa_WindowPos2sMESA => _mesa_WindowPos2s
_mesa_WindowPos2svMESA => _mesa_WindowPos2sv
_mesa_WindowPos3dMESA => _mesa_WindowPos3d
_mesa_WindowPos3dvMESA => _mesa_WindowPos3dv
_mesa_WindowPos3fMESA => _mesa_WindowPos3f
_mesa_WindowPos3fvMESA => _mesa_WindowPos3fv
_mesa_WindowPos3iMESA => _mesa_WindowPos3i
_mesa_WindowPos3ivMESA => _mesa_WindowPos3iv
_mesa_WindowPos3sMESA => _mesa_WindowPos3s
_mesa_WindowPos3svMESA => _mesa_WindowPos3sv
loopback_Color3b_f => _mesa_Color3b
loopback_Color3bv_f => _mesa_Color3bv
loopback_Color3d_f => _mesa_Color3d
loopback_Color3dv_f => _mesa_Color3dv
loopback_Color3i_f => _mesa_Color3i
loopback_Color3iv_f => _mesa_Color3iv
loopback_Color3s_f => _mesa_Color3s
loopback_Color3sv_f => _mesa_Color3sv
loopback_Color3ub_f => _mesa_Color3ub
loopback_Color3ubv_f => _mesa_Color3ubv
loopback_Color3ui_f => _mesa_Color3ui
loopback_Color3uiv_f => _mesa_Color3uiv
loopback_Color3us_f => _mesa_Color3us
loopback_Color3usv_f => _mesa_Color3usv
loopback_Color4b_f => _mesa_Color4b
loopback_Color4bv_f => _mesa_Color4bv
loopback_Color4d_f => _mesa_Color4d
loopback_Color4dv_f => _mesa_Color4dv
loopback_Color4i_f => _mesa_Color4i
loopback_Color4iv_f => _mesa_Color4iv
loopback_Color4s_f => _mesa_Color4s
loopback_Color4sv_f => _mesa_Color4sv
loopback_Color4ub_f => _mesa_Color4ub
loopback_Color4ubv_f => _mesa_Color4ubv
loopback_Color4ui_f => _mesa_Color4ui
loopback_Color4uiv_f => _mesa_Color4uiv
loopback_Color4us_f => _mesa_Color4us
loopback_Color4usv_f => _mesa_Color4usv
loopback_EdgeFlagv => _mesa_EdgeFlagv
loopback_EvalCoord1d => _mesa_EvalCoord1d
loopback_EvalCoord1dv => _mesa_EvalCoord1dv
loopback_EvalCoord1fv => _mesa_EvalCoord1fv
loopback_EvalCoord2d => _mesa_EvalCoord2d
loopback_EvalCoord2dv => _mesa_EvalCoord2dv
loopback_EvalCoord2fv => _mesa_EvalCoord2fv
loopback_FogCoorddEXT => _mesa_FogCoordd
loopback_FogCoorddvEXT => _mesa_FogCoorddv
loopback_Indexd => _mesa_Indexd
loopback_Indexdv => _mesa_Indexdv
loopback_Indexi => _mesa_Indexi
loopback_Indexiv => _mesa_Indexiv
loopback_Indexs => _mesa_Indexs
loopback_Indexsv => _mesa_Indexsv
loopback_Indexub => _mesa_Indexub
loopback_Indexubv => _mesa_Indexubv
loopback_Materialf => _mesa_Materialf
loopback_Materiali => _mesa_Materiali
loopback_Materialiv => _mesa_Materialiv
loopback_MultiTexCoord1dARB => _mesa_MultiTexCoord1d
loopback_MultiTexCoord1dvARB => _mesa_MultiTexCoord1dv
loopback_MultiTexCoord1iARB => _mesa_MultiTexCoord1i
loopback_MultiTexCoord1ivARB => _mesa_MultiTexCoord1iv
loopback_MultiTexCoord1sARB => _mesa_MultiTexCoord1s
loopback_MultiTexCoord1svARB => _mesa_MultiTexCoord1sv
loopback_MultiTexCoord2dARB => _mesa_MultiTexCoord2d
loopback_MultiTexCoord2dvARB => _mesa_MultiTexCoord2dv
loopback_MultiTexCoord2iARB => _mesa_MultiTexCoord2i
loopback_MultiTexCoord2ivARB => _mesa_MultiTexCoord2iv
loopback_MultiTexCoord2sARB => _mesa_MultiTexCoord2s
loopback_MultiTexCoord2svARB => _mesa_MultiTexCoord2sv
loopback_MultiTexCoord3dARB => _mesa_MultiTexCoord3d
loopback_MultiTexCoord3dvARB => _mesa_MultiTexCoord3dv
loopback_MultiTexCoord3iARB => _mesa_MultiTexCoord3i
loopback_MultiTexCoord3ivARB => _mesa_MultiTexCoord3iv
loopback_MultiTexCoord3sARB => _mesa_MultiTexCoord3s
loopback_MultiTexCoord3svARB => _mesa_MultiTexCoord3sv
loopback_MultiTexCoord4dARB => _mesa_MultiTexCoord4d
loopback_MultiTexCoord4dvARB => _mesa_MultiTexCoord4dv
loopback_MultiTexCoord4iARB => _mesa_MultiTexCoord4i
loopback_MultiTexCoord4ivARB => _mesa_MultiTexCoord4iv
loopback_MultiTexCoord4sARB => _mesa_MultiTexCoord4s
loopback_MultiTexCoord4svARB => _mesa_MultiTexCoord4sv
loopback_Normal3b => _mesa_Normal3b
loopback_Normal3bv => _mesa_Normal3bv
loopback_Normal3d => _mesa_Normal3d
loopback_Normal3dv => _mesa_Normal3dv
loopback_Normal3i => _mesa_Normal3i
loopback_Normal3iv => _mesa_Normal3iv
loopback_Normal3s => _mesa_Normal3s
loopback_Normal3sv => _mesa_Normal3sv
loopback_Rectd => _mesa_Rectd
loopback_Rectdv => _mesa_Rectdv
loopback_Rectfv => _mesa_Rectfv
loopback_Recti => _mesa_Recti
loopback_Rectiv => _mesa_Rectiv
loopback_Rects => _mesa_Rects
loopback_Rectsv => _mesa_Rectsv
loopback_SecondaryColor3bEXT_f => _mesa_SecondaryColor3b
loopback_SecondaryColor3bvEXT_f => _mesa_SecondaryColor3bv
loopback_SecondaryColor3dEXT_f => _mesa_SecondaryColor3d
loopback_SecondaryColor3dvEXT_f => _mesa_SecondaryColor3dv
loopback_SecondaryColor3iEXT_f => _mesa_SecondaryColor3i
loopback_SecondaryColor3ivEXT_f => _mesa_SecondaryColor3iv
loopback_SecondaryColor3sEXT_f => _mesa_SecondaryColor3s
loopback_SecondaryColor3svEXT_f => _mesa_SecondaryColor3sv
loopback_SecondaryColor3ubEXT_f => _mesa_SecondaryColor3ub
loopback_SecondaryColor3ubvEXT_f => _mesa_SecondaryColor3ubv
loopback_SecondaryColor3uiEXT_f => _mesa_SecondaryColor3ui
loopback_SecondaryColor3uivEXT_f => _mesa_SecondaryColor3uiv
loopback_SecondaryColor3usEXT_f => _mesa_SecondaryColor3us
loopback_SecondaryColor3usvEXT_f => _mesa_SecondaryColor3usv
loopback_TexCoord1d => _mesa_TexCoord1d
loopback_TexCoord1dv => _mesa_TexCoord1dv
loopback_TexCoord1i => _mesa_TexCoord1i
loopback_TexCoord1iv => _mesa_TexCoord1iv
loopback_TexCoord1s => _mesa_TexCoord1s
loopback_TexCoord1sv => _mesa_TexCoord1sv
loopback_TexCoord2d => _mesa_TexCoord2d
loopback_TexCoord2dv => _mesa_TexCoord2dv
loopback_TexCoord2i => _mesa_TexCoord2i
loopback_TexCoord2iv => _mesa_TexCoord2iv
loopback_TexCoord2s => _mesa_TexCoord2s
loopback_TexCoord2sv => _mesa_TexCoord2sv
loopback_TexCoord3d => _mesa_TexCoord3d
loopback_TexCoord3dv => _mesa_TexCoord3dv
loopback_TexCoord3i => _mesa_TexCoord3i
loopback_TexCoord3iv => _mesa_TexCoord3iv
loopback_TexCoord3s => _mesa_TexCoord3s
loopback_TexCoord3sv => _mesa_TexCoord3sv
loopback_TexCoord4d => _mesa_TexCoord4d
loopback_TexCoord4dv => _mesa_TexCoord4dv
loopback_TexCoord4i => _mesa_TexCoord4i
loopback_TexCoord4iv => _mesa_TexCoord4iv
loopback_TexCoord4s => _mesa_TexCoord4s
loopback_TexCoord4sv => _mesa_TexCoord4sv
loopback_Vertex2d => _mesa_Vertex2d
loopback_Vertex2dv => _mesa_Vertex2dv
loopback_Vertex2i => _mesa_Vertex2i
loopback_Vertex2iv => _mesa_Vertex2iv
loopback_Vertex2s => _mesa_Vertex2s
loopback_Vertex2sv => _mesa_Vertex2sv
loopback_Vertex3d => _mesa_Vertex3d
loopback_Vertex3dv => _mesa_Vertex3dv
loopback_Vertex3i => _mesa_Vertex3i
loopback_Vertex3iv => _mesa_Vertex3iv
loopback_Vertex3s => _mesa_Vertex3s
loopback_Vertex3sv => _mesa_Vertex3sv
loopback_Vertex4d => _mesa_Vertex4d
loopback_Vertex4dv => _mesa_Vertex4dv
loopback_Vertex4i => _mesa_Vertex4i
loopback_Vertex4iv => _mesa_Vertex4iv
loopback_Vertex4s => _mesa_Vertex4s
loopback_Vertex4sv => _mesa_Vertex4sv
loopback_VertexAttrib1dARB => _mesa_VertexAttrib1d
loopback_VertexAttrib1dNV => _mesa_VertexAttrib1dNV
loopback_VertexAttrib1dvARB => _mesa_VertexAttrib1dv
loopback_VertexAttrib1dvNV => _mesa_VertexAttrib1dvNV
loopback_VertexAttrib1sARB => _mesa_VertexAttrib1s
loopback_VertexAttrib1sNV => _mesa_VertexAttrib1sNV
loopback_VertexAttrib1svARB => _mesa_VertexAttrib1sv
loopback_VertexAttrib1svNV => _mesa_VertexAttrib1svNV
loopback_VertexAttrib2dARB => _mesa_VertexAttrib2d
loopback_VertexAttrib2dNV => _mesa_VertexAttrib2dNV
loopback_VertexAttrib2dvARB => _mesa_VertexAttrib2dv
loopback_VertexAttrib2dvNV => _mesa_VertexAttrib2dvNV
loopback_VertexAttrib2sARB => _mesa_VertexAttrib2s
loopback_VertexAttrib2sNV => _mesa_VertexAttrib2sNV
loopback_VertexAttrib2svARB => _mesa_VertexAttrib2sv
loopback_VertexAttrib2svNV => _mesa_VertexAttrib2svNV
loopback_VertexAttrib3dARB => _mesa_VertexAttrib3d
loopback_VertexAttrib3dNV => _mesa_VertexAttrib3dNV
loopback_VertexAttrib3dvARB => _mesa_VertexAttrib3dv
loopback_VertexAttrib3dvNV => _mesa_VertexAttrib3dvNV
loopback_VertexAttrib3sARB => _mesa_VertexAttrib3s
loopback_VertexAttrib3sNV => _mesa_VertexAttrib3sNV
loopback_VertexAttrib3svARB => _mesa_VertexAttrib3sv
loopback_VertexAttrib3svNV => _mesa_VertexAttrib3svNV
loopback_VertexAttrib4NbvARB => _mesa_VertexAttrib4Nbv
loopback_VertexAttrib4NivARB => _mesa_VertexAttrib4Niv
loopback_VertexAttrib4NsvARB => _mesa_VertexAttrib4Nsv
loopback_VertexAttrib4NubARB => _mesa_VertexAttrib4Nub
loopback_VertexAttrib4NubvARB => _mesa_VertexAttrib4Nubv
loopback_VertexAttrib4NuivARB => _mesa_VertexAttrib4Nuiv
loopback_VertexAttrib4NusvARB => _mesa_VertexAttrib4Nusv
loopback_VertexAttrib4bvARB => _mesa_VertexAttrib4bv
loopback_VertexAttrib4dARB => _mesa_VertexAttrib4d
loopback_VertexAttrib4dNV => _mesa_VertexAttrib4dNV
loopback_VertexAttrib4dvARB => _mesa_VertexAttrib4dv
loopback_VertexAttrib4dvNV => _mesa_VertexAttrib4dvNV
loopback_VertexAttrib4ivARB => _mesa_VertexAttrib4iv
loopback_VertexAttrib4sARB => _mesa_VertexAttrib4s
loopback_VertexAttrib4sNV => _mesa_VertexAttrib4sNV
loopback_VertexAttrib4svARB => _mesa_VertexAttrib4sv
loopback_VertexAttrib4svNV => _mesa_VertexAttrib4svNV
loopback_VertexAttrib4ubNV => _mesa_VertexAttrib4ubNV
loopback_VertexAttrib4ubvARB => _mesa_VertexAttrib4ubv
loopback_VertexAttrib4ubvNV => _mesa_VertexAttrib4ubvNV
loopback_VertexAttrib4uivARB => _mesa_VertexAttrib4uiv
loopback_VertexAttrib4usvARB => _mesa_VertexAttrib4usv
loopback_VertexAttribI1iv => _mesa_VertexAttribI1iv
loopback_VertexAttribI1uiv => _mesa_VertexAttribI1uiv
loopback_VertexAttribI4bv => _mesa_VertexAttribI4bv
loopback_VertexAttribI4sv => _mesa_VertexAttribI4sv
loopback_VertexAttribI4ubv => _mesa_VertexAttribI4ubv
loopback_VertexAttribI4usv => _mesa_VertexAttribI4usv
loopback_VertexAttribs1dvNV => _mesa_VertexAttribs1dvNV
loopback_VertexAttribs1fvNV => _mesa_VertexAttribs1fvNV
loopback_VertexAttribs1svNV => _mesa_VertexAttribs1svNV
loopback_VertexAttribs2dvNV => _mesa_VertexAttribs2dvNV
loopback_VertexAttribs2fvNV => _mesa_VertexAttribs2fvNV
loopback_VertexAttribs2svNV => _mesa_VertexAttribs2svNV
loopback_VertexAttribs3dvNV => _mesa_VertexAttribs3dvNV
loopback_VertexAttribs3fvNV => _mesa_VertexAttribs3fvNV
loopback_VertexAttribs3svNV => _mesa_VertexAttribs3svNV
loopback_VertexAttribs4dvNV => _mesa_VertexAttribs4dvNV
loopback_VertexAttribs4fvNV => _mesa_VertexAttribs4fvNV
loopback_VertexAttribs4svNV => _mesa_VertexAttribs4svNV
loopback_VertexAttribs4ubvNV => _mesa_VertexAttribs4ubvNV
And changes the primary name assignment in the XML as follows:
ActiveTextureARB => ActiveTexture
AlphaFuncxOES => AlphaFuncx
BeginConditionalRenderNV => BeginConditionalRender
BeginQueryARB => BeginQuery
BeginTransformFeedbackEXT => BeginTransformFeedback
BindAttribLocationARB => BindAttribLocation
BindBufferARB => BindBuffer
BindBufferBaseEXT => BindBufferBase
BindBufferRangeEXT => BindBufferRange
BindFragDataLocationEXT => BindFragDataLocation
BindFramebufferEXT => BindFramebuffer
BindProgramNV => BindProgramARB
BindRenderbufferEXT => BindRenderbuffer
BlendEquationSeparateEXT => BlendEquationSeparate
BlendFuncSeparateEXT => BlendFuncSeparate
BlitFramebufferEXT => BlitFramebuffer
BufferDataARB => BufferData
BufferSubDataARB => BufferSubData
CheckFramebufferStatusEXT => CheckFramebufferStatus
ClampColorARB => ClampColor
ClearColorxOES => ClearColorx
ClearDepthxOES => ClearDepthx
ClientActiveTextureARB => ClientActiveTexture
ClipPlanefOES => ClipPlanef
ClipPlanexOES => ClipPlanex
Color4xOES => Color4x
ColorMaskIndexedEXT => ColorMaski
CompileShaderARB => CompileShader
CompressedTexImage1DARB => CompressedTexImage1D
CompressedTexImage2DARB => CompressedTexImage2D
CompressedTexImage3DARB => CompressedTexImage3D
CompressedTexSubImage1DARB => CompressedTexSubImage1D
CompressedTexSubImage2DARB => CompressedTexSubImage2D
CompressedTexSubImage3DARB => CompressedTexSubImage3D
DeleteBuffersARB => DeleteBuffers
DeleteFramebuffersEXT => DeleteFramebuffers
DeleteProgramsNV => DeleteProgramsARB
DeleteQueriesARB => DeleteQueries
DeleteRenderbuffersEXT => DeleteRenderbuffers
DeleteVertexArraysAPPLE => DeleteVertexArrays
DepthRangexOES => DepthRangex
DisableIndexedEXT => Disablei
DisableVertexAttribArrayARB => DisableVertexAttribArray
DrawBuffersARB => DrawBuffers
EnableIndexedEXT => Enablei
EnableVertexAttribArrayARB => EnableVertexAttribArray
EndConditionalRenderNV => EndConditionalRender
EndQueryARB => EndQuery
EndTransformFeedbackEXT => EndTransformFeedback
FogCoordPointerEXT => FogCoordPointer
FogCoorddEXT => FogCoordd
FogCoorddvEXT => FogCoorddv
FogxOES => Fogx
FogxvOES => Fogxv
FramebufferRenderbufferEXT => FramebufferRenderbuffer
FramebufferTexture1DEXT => FramebufferTexture1D
FramebufferTexture2DEXT => FramebufferTexture2D
FramebufferTexture3DEXT => FramebufferTexture3D
FramebufferTextureLayerEXT => FramebufferTextureLayer
FrustumfOES => Frustumf
FrustumxOES => Frustumx
GenBuffersARB => GenBuffers
GenFramebuffersEXT => GenFramebuffers
GenProgramsNV => GenProgramsARB
GenQueriesARB => GenQueries
GenRenderbuffersEXT => GenRenderbuffers
GenerateMipmapEXT => GenerateMipmap
GetActiveAttribARB => GetActiveAttrib
GetActiveUniformARB => GetActiveUniform
GetAttribLocationARB => GetAttribLocation
GetBooleanIndexedvEXT => GetBooleani_v
GetBufferParameterivARB => GetBufferParameteriv
GetBufferPointervARB => GetBufferPointerv
GetBufferSubDataARB => GetBufferSubData
GetClipPlanefOES => GetClipPlanef
GetClipPlanexOES => GetClipPlanex
GetCompressedTexImageARB => GetCompressedTexImage
GetFixedvOES => GetFixedv
GetFragDataLocationEXT => GetFragDataLocation
GetFramebufferAttachmentParameterivEXT => GetFramebufferAttachmentParameteriv
GetIntegerIndexedvEXT => GetIntegeri_v
GetLightxvOES => GetLightxv
GetMaterialxvOES => GetMaterialxv
GetQueryObjecti64vEXT => GetQueryObjecti64v
GetQueryObjectivARB => GetQueryObjectiv
GetQueryObjectui64vEXT => GetQueryObjectui64v
GetQueryObjectuivARB => GetQueryObjectuiv
GetQueryivARB => GetQueryiv
GetRenderbufferParameterivEXT => GetRenderbufferParameteriv
GetShaderSourceARB => GetShaderSource
GetTexEnvxvOES => GetTexEnvxv
GetTexParameterIivEXT => GetTexParameterIiv
GetTexParameterIuivEXT => GetTexParameterIuiv
GetTexParameterxvOES => GetTexParameterxv
GetTransformFeedbackVaryingEXT => GetTransformFeedbackVarying
GetUniformLocationARB => GetUniformLocation
GetUniformfvARB => GetUniformfv
GetUniformivARB => GetUniformiv
GetUniformuivEXT => GetUniformuiv
GetVertexAttribIivEXT => GetVertexAttribIiv
GetVertexAttribIuivEXT => GetVertexAttribIuiv
GetVertexAttribPointervNV => GetVertexAttribPointerv
GetVertexAttribdvARB => GetVertexAttribdv
GetVertexAttribfvARB => GetVertexAttribfv
GetVertexAttribivARB => GetVertexAttribiv
IsBufferARB => IsBuffer
IsEnabledIndexedEXT => IsEnabledi
IsFramebufferEXT => IsFramebuffer
IsProgramNV => IsProgramARB
IsQueryARB => IsQuery
IsRenderbufferEXT => IsRenderbuffer
IsVertexArrayAPPLE => IsVertexArray
LightModelxOES => LightModelx
LightModelxvOES => LightModelxv
LightxOES => Lightx
LightxvOES => Lightxv
LineWidthxOES => LineWidthx
LinkProgramARB => LinkProgram
LoadMatrixxOES => LoadMatrixx
LoadTransposeMatrixdARB => LoadTransposeMatrixd
LoadTransposeMatrixfARB => LoadTransposeMatrixf
MapBufferARB => MapBuffer
MaterialxOES => Materialx
MaterialxvOES => Materialxv
MultMatrixxOES => MultMatrixx
MultTransposeMatrixdARB => MultTransposeMatrixd
MultTransposeMatrixfARB => MultTransposeMatrixf
MultiDrawArraysEXT => MultiDrawArrays
MultiTexCoord1dARB => MultiTexCoord1d
MultiTexCoord1dvARB => MultiTexCoord1dv
MultiTexCoord1iARB => MultiTexCoord1i
MultiTexCoord1ivARB => MultiTexCoord1iv
MultiTexCoord1sARB => MultiTexCoord1s
MultiTexCoord1svARB => MultiTexCoord1sv
MultiTexCoord2dARB => MultiTexCoord2d
MultiTexCoord2dvARB => MultiTexCoord2dv
MultiTexCoord2iARB => MultiTexCoord2i
MultiTexCoord2ivARB => MultiTexCoord2iv
MultiTexCoord2sARB => MultiTexCoord2s
MultiTexCoord2svARB => MultiTexCoord2sv
MultiTexCoord3dARB => MultiTexCoord3d
MultiTexCoord3dvARB => MultiTexCoord3dv
MultiTexCoord3iARB => MultiTexCoord3i
MultiTexCoord3ivARB => MultiTexCoord3iv
MultiTexCoord3sARB => MultiTexCoord3s
MultiTexCoord3svARB => MultiTexCoord3sv
MultiTexCoord4dARB => MultiTexCoord4d
MultiTexCoord4dvARB => MultiTexCoord4dv
MultiTexCoord4iARB => MultiTexCoord4i
MultiTexCoord4ivARB => MultiTexCoord4iv
MultiTexCoord4sARB => MultiTexCoord4s
MultiTexCoord4svARB => MultiTexCoord4sv
MultiTexCoord4xOES => MultiTexCoord4x
Normal3xOES => Normal3x
OrthofOES => Orthof
OrthoxOES => Orthox
PointParameterfEXT => PointParameterf
PointParameterfvEXT => PointParameterfv
PointParameteriNV => PointParameteri
PointParameterivNV => PointParameteriv
PointParameterxOES => PointParameterx
PointParameterxvOES => PointParameterxv
PointSizexOES => PointSizex
PolygonOffsetxOES => PolygonOffsetx
PrimitiveRestartIndexNV => PrimitiveRestartIndex
ProvokingVertexEXT => ProvokingVertex
RenderbufferStorageEXT => RenderbufferStorage
RotatexOES => Rotatex
SampleCoverageARB => SampleCoverage
SampleCoveragexOES => SampleCoveragex
ScalexOES => Scalex
SecondaryColor3bEXT => SecondaryColor3b
SecondaryColor3bvEXT => SecondaryColor3bv
SecondaryColor3dEXT => SecondaryColor3d
SecondaryColor3dvEXT => SecondaryColor3dv
SecondaryColor3iEXT => SecondaryColor3i
SecondaryColor3ivEXT => SecondaryColor3iv
SecondaryColor3sEXT => SecondaryColor3s
SecondaryColor3svEXT => SecondaryColor3sv
SecondaryColor3ubEXT => SecondaryColor3ub
SecondaryColor3ubvEXT => SecondaryColor3ubv
SecondaryColor3uiEXT => SecondaryColor3ui
SecondaryColor3uivEXT => SecondaryColor3uiv
SecondaryColor3usEXT => SecondaryColor3us
SecondaryColor3usvEXT => SecondaryColor3usv
SecondaryColorPointerEXT => SecondaryColorPointer
ShaderSourceARB => ShaderSource
TexBufferARB => TexBuffer
TexEnvxOES => TexEnvx
TexEnvxvOES => TexEnvxv
TexParameterIivEXT => TexParameterIiv
TexParameterIuivEXT => TexParameterIuiv
TexParameterxOES => TexParameterx
TexParameterxvOES => TexParameterxv
TransformFeedbackVaryingsEXT => TransformFeedbackVaryings
TranslatexOES => Translatex
Uniform1fARB => Uniform1f
Uniform1fvARB => Uniform1fv
Uniform1iARB => Uniform1i
Uniform1ivARB => Uniform1iv
Uniform1uiEXT => Uniform1ui
Uniform1uivEXT => Uniform1uiv
Uniform2fARB => Uniform2f
Uniform2fvARB => Uniform2fv
Uniform2iARB => Uniform2i
Uniform2ivARB => Uniform2iv
Uniform2uiEXT => Uniform2ui
Uniform2uivEXT => Uniform2uiv
Uniform3fARB => Uniform3f
Uniform3fvARB => Uniform3fv
Uniform3iARB => Uniform3i
Uniform3ivARB => Uniform3iv
Uniform3uiEXT => Uniform3ui
Uniform3uivEXT => Uniform3uiv
Uniform4fARB => Uniform4f
Uniform4fvARB => Uniform4fv
Uniform4iARB => Uniform4i
Uniform4ivARB => Uniform4iv
Uniform4uiEXT => Uniform4ui
Uniform4uivEXT => Uniform4uiv
UniformMatrix2fvARB => UniformMatrix2fv
UniformMatrix3fvARB => UniformMatrix3fv
UniformMatrix4fvARB => UniformMatrix4fv
UnmapBufferARB => UnmapBuffer
UseProgramObjectARB => UseProgram
ValidateProgramARB => ValidateProgram
VertexAttrib1dARB => VertexAttrib1d
VertexAttrib1dvARB => VertexAttrib1dv
VertexAttrib1sARB => VertexAttrib1s
VertexAttrib1svARB => VertexAttrib1sv
VertexAttrib2dARB => VertexAttrib2d
VertexAttrib2dvARB => VertexAttrib2dv
VertexAttrib2sARB => VertexAttrib2s
VertexAttrib2svARB => VertexAttrib2sv
VertexAttrib3dARB => VertexAttrib3d
VertexAttrib3dvARB => VertexAttrib3dv
VertexAttrib3sARB => VertexAttrib3s
VertexAttrib3svARB => VertexAttrib3sv
VertexAttrib4NbvARB => VertexAttrib4Nbv
VertexAttrib4NivARB => VertexAttrib4Niv
VertexAttrib4NsvARB => VertexAttrib4Nsv
VertexAttrib4NubARB => VertexAttrib4Nub
VertexAttrib4NubvARB => VertexAttrib4Nubv
VertexAttrib4NuivARB => VertexAttrib4Nuiv
VertexAttrib4NusvARB => VertexAttrib4Nusv
VertexAttrib4bvARB => VertexAttrib4bv
VertexAttrib4dARB => VertexAttrib4d
VertexAttrib4dvARB => VertexAttrib4dv
VertexAttrib4ivARB => VertexAttrib4iv
VertexAttrib4sARB => VertexAttrib4s
VertexAttrib4svARB => VertexAttrib4sv
VertexAttrib4ubvARB => VertexAttrib4ubv
VertexAttrib4uivARB => VertexAttrib4uiv
VertexAttrib4usvARB => VertexAttrib4usv
VertexAttribDivisorARB => VertexAttribDivisor
VertexAttribI1ivEXT => VertexAttribI1iv
VertexAttribI1uivEXT => VertexAttribI1uiv
VertexAttribI4bvEXT => VertexAttribI4bv
VertexAttribI4svEXT => VertexAttribI4sv
VertexAttribI4ubvEXT => VertexAttribI4ubv
VertexAttribI4usvEXT => VertexAttribI4usv
VertexAttribIPointerEXT => VertexAttribIPointer
VertexAttribPointerARB => VertexAttribPointer
WindowPos2dMESA => WindowPos2d
WindowPos2dvMESA => WindowPos2dv
WindowPos2fMESA => WindowPos2f
WindowPos2fvMESA => WindowPos2fv
WindowPos2iMESA => WindowPos2i
WindowPos2ivMESA => WindowPos2iv
WindowPos2sMESA => WindowPos2s
WindowPos2svMESA => WindowPos2sv
WindowPos3dMESA => WindowPos3d
WindowPos3dvMESA => WindowPos3dv
WindowPos3fMESA => WindowPos3f
WindowPos3fvMESA => WindowPos3fv
WindowPos3iMESA => WindowPos3i
WindowPos3ivMESA => WindowPos3iv
WindowPos3sMESA => WindowPos3s
WindowPos3svMESA => WindowPos3sv
Acked-by: Brian Paul <[email protected]>
|
|
|
|
|
|
|
|
|
|
|
|
| |
v2: Allow GL_ARB_shader_objects functions in core profile because we
still expose the extension string there. Don't allow
glBindFragDataLocation in GLES3 because it's not part of that API.
Based (mostly) on review comments from Eric Anholt.
NOTE: This is a candidate for the 9.0 branch
Signed-off-by: Ian Romanick <[email protected]>
Reviewed-by: Eric Anholt <[email protected]>
|
|
|
|
| |
Reviewed-by: Kenneth Graunke <[email protected]>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Add implementations of the two API functions,
Add a new strings to uint mapping for index bindings
Add the blending mode validation for SRC1 + SRC_ALPHA_SATURATE
Add get for MAX_DUAL_SOURCE_DRAW_BUFFERS
v2:
Add check in valid_to_render to address case in spec ERRORS.
v3:
Add index to ir.h so this patch compiles on its own
fixup comment
v4: fixup Brian's comments
The GLSL patch will setup the indices.
Signed-off-by: Dave Airlie <[email protected]>
|
|
|
|
|
| |
Probably a several places missing, but enough to cover all headers
(in)directly included by uniform_query.cpp, and fix the MSVC build.
|
|
|
|
|
| |
Signed-off-by: Ian Romanick <[email protected]>
Reviewed-by: Kenneth Graunke <[email protected]>
|
|
|
|
|
| |
Signed-off-by: Ian Romanick <[email protected]>
Reviewed-by: Kenneth Graunke <[email protected]>
|
| |
|
|
|
|
|
|
|
| |
Fixes failure on restoring state when the program was active but
deleted, and the name no longer exists.
Bug #31194
|
| |
|
|
|
|
|
| |
Really just filling in the entry points. None of them do anything
other than validate their inputs.
|
| |
|
|
|
|
|
|
| |
laying down the foundation for everything and implementing most of the
stuff.
linking, gl_VerticesIn and multidimensional inputs are left.
|
|
Remove the unneeded ctx->Driver hooks for shader-related functions.
Move state and API-related things into main/.
|