OpenHarmony/third_party_mesa3d
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

mesa: Use shared code for converting shader targets to short strings.

Browse Source 
We were duplicating this code all over the place, and they all would need
updating for the next set of shader targets.

Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
Reviewed-by: Paul Berry <stereotype441@gmail.com>
This commit is contained in:
Eric Anholt
2013-06-12 16:57:11 -07:00
parent 426ca34b7a
commit faf3dbad0d
9 changed files with 61 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/glsl/link_varyings.cpp
View File

@@ -31,6 +31,7 @@
#include "main/mtypes.h"
#include "glsl_symbol_table.h"
#include "glsl_parser_extras.h"
#include "ir_optimization.h"
#include "linker.h"
#include "link_varyings.h"
@@ -47,9 +48,10 @@ cross_validate_outputs_to_inputs(struct gl_shader_program *prog,
gl_shader *producer, gl_shader *consumer)
{
glsl_symbol_table parameters;
/* FINISHME: Figure these out dynamically. */
const char *const producer_stage = "vertex";
const char *const consumer_stage = "fragment";
const char *const producer_stage =
_mesa_glsl_shader_target_name(producer->Type);
const char *const consumer_stage =
_mesa_glsl_shader_target_name(consumer->Type);
/* Find all shader outputs in the "producer" stage.
*/
@@ -1135,8 +1137,11 @@ assign_varying_locations(struct gl_context *ctx,
* "glsl1-varying read but not written" in piglit.
*/
linker_error(prog, "fragment shader varying %s not written "
"by vertex shader\n.", var->name);
linker_error(prog, "%s shader varying %s not written "
"by %s shader\n.",
_mesa_glsl_shader_target_name(consumer->Type),
var->name,
_mesa_glsl_shader_target_name(producer->Type));
}
/* An 'in' variable is only really a shader input if its