delta/mesa.git/src/glsl/standalone_scaffolding.h, branch baserock/james/test

mesa: Silence unused parameter warning in _mesa_clear_shader_program_data

2014-10-25T02:54:38+00:00

Just remove the parameter.

Signed-off-by: Ian Romanick 
Reviewed-by: Brian Paul 
Reviewed-by: Matt Turner 
Reviewed-by: Kenneth Graunke

linker: Rely on _mesa_clear_shader_program_data to clear link information

2014-10-25T02:54:38+00:00

_mesa_link_shader_program already calls _mesa_clear_shader_program_data
before calling link_shaders, so this is already done.

Signed-off-by: Ian Romanick 
Reviewed-by: Matt Turner

mesa/cs: Add a MESA_SHADER_COMPUTE stage and update switch statements.

2014-02-05T17:00:34+00:00

This patch adds MESA_SHADER_COMPUTE to the gl_shader_stage enum.
Also, where it is trivial to do so, it adds a compute shader case to
switch statements that switch based on the type of shader.  This
avoids "unhandled switch case" compiler warnings.

Reviewed-by: Matt Turner

mesa: Clean up nomenclature for pipeline stages.

2014-01-08T15:30:30+00:00

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 

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

glsl: Don't return bad values from _mesa_shader_type_to_index.

2013-12-17T20:31:35+00:00

This will avoid compiler warnings in the patch that follows.  There
should be no user-visible effect because the change only affects the
behaviour when an invalid enum is passed to
_mesa_shader_type_to_index(), and that can only happen if there is a
bug elsewhere in Mesa.

Reviewed-by: Brian Paul

glsl: Copy _mesa_shader_type_to_index() to standalone scaffolding.

2013-05-12T16:36:18+00:00

We can't include shaderobj.h from the standalone utilities, so we
unfortunately have to copy this function.

Signed-off-by: Kenneth Graunke 
Reviewed-by: Ian Romanick 
Reviewed-by: Eric Anholt

mesa: Report ARB_debug_output for both shader errors and warnings.

2013-03-05T22:25:00+00:00

This ends up reusing the dynamic ID support, so a silly enum gets to go
away.  We don't assign good IDs to different messages yet, but at least
that's tractable now.

Reviewed-by: Jordan Justen

glsl/standalone_scaffolding: Add stub for _mesa_warning()

2013-01-25T05:11:41+00:00

A subsequent patch will add mesa/main/imports.c as a dependency to the
compiler, which in turn requires that _mesa_warning() be defined.

The real definition of _mesa_warning() is in mesa/main/errors.c, but to
pull that file into the standalone scaffolding would require transitively
pulling in the dispatch tables.

Reviewed-by: Ian Romanick 
Acked-by: Paul Berry 
Signed-off-by: Chad Versace

glsl: report errors via GL_ARB_debug_output

2012-05-02T16:12:23+00:00

Reviewed-by: Brian Paul

glsl: Move functions into standalone_scaffolding.cpp for later reuse.

2011-07-22T16:45:11+00:00

This patch moves the following functions from main.cpp (the main cpp
file for the standalone executable that is used to create the built-in
functions) to standalone_scaffolding.cpp, so that they can be re-used
in other standalone executables:

- initialize_context()*
- _mesa_new_shader()
- _mesa_reference_shader()

*initialize_context contained some code that was specific to main.cpp,
so it was split into two functions: initialize_context() (which
remains in main.cpp), and initialize_context_from_defaults() (which is
in standalone_scaffolding.cpp).