fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2025-12-21 13:40:16 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1
mesa/src/glsl/glsl_parser_extras.cpp

1659 lines
48 KiB
C++
Raw Normal View History

Initial commit. lol
2010-02-22 13:19:34 -08:00
/*
* Copyright © 2008, 2009 Intel Corporation
*
* Permission is hereby granted, free of charge, to any person obtaining a
* copy of this software and associated documentation files (the "Software"),
* to deal in the Software without restriction, including without limitation
* the rights to use, copy, modify, merge, publish, distribute, sublicense,
* and/or sell copies of the Software, and to permit persons to whom the
* Software is furnished to do so, subject to the following conditions:
*
* The above copyright notice and this permission notice (including the next
* paragraph) shall be included in all copies or substantial portions of the
* Software.
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
* THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
* FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
* DEALINGS IN THE SOFTWARE.
*/
#include <stdio.h>
#include <stdarg.h>
#include <string.h>
#include <assert.h>
Change error/warning functions to print to the info log.
2010-06-17 15:15:35 -07:00
extern "C" {
Drop GLcontext typedef and use struct gl_context instead
2010-10-12 12:26:10 -04:00
#include "main/core.h" /* for struct gl_context */
glsl: add support for using API_OPENGL_CORE Signed-off-by: Jordan Justen <jordan.l.justen@intel.com> Reviewed-by: Brian Paul <brianp@vmware.com> Reviewed-by: Eric Anholt <eric@anholt.net> Reviewed-by: Ian Romanick <ian.d.romanick@intel.com>
2012-07-24 14:48:57 -07:00
#include "main/context.h"
mesa: Move the common _mesa_glsl_compile_shader() code to glsl/. This code had no relation to ir_to_mesa.cpp, since it was also used by intel and state_tracker, and most of it was duplicated with the standalone compiler (which has periodically drifted from the Mesa copy). v2: Split from the ir_to_mesa to shaderapi.c changes. Acked-by: Paul Berry <stereotype441@gmail.com> (v1) Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
2013-06-12 15:49:43 -07:00
#include "main/shaderobj.h"
Change error/warning functions to print to the info log.
2010-06-17 15:15:35 -07:00
}
Convert everything from the talloc API to the ralloc API.
2011-01-21 14:32:31 -08:00
#include "ralloc.h"
Initial commit. lol
2010-02-22 13:19:34 -08:00
#include "ast.h"
#include "glsl_parser_extras.h"
autoconf for the ...
2010-02-25 17:17:23 -08:00
#include "glsl_parser.h"
glsl2: Move the common optimization passes to a helper function. These are passes that we expect all codegen to be happy with. The other lowering passes for Mesa IR are moved to the Mesa IR generator.
2010-08-10 13:06:49 -07:00
#include "ir_optimization.h"
glsl2: Perform initial bits of loop analysis during compilation
2010-08-26 16:45:22 -07:00
#include "loop_analysis.h"
Initial commit. lol
2010-02-22 13:19:34 -08:00
glsl: Make a function to express a GLSL version ir human-readable form. This will be useful in generating more helpful error messages, especially with the addition of GLSL 3.00 ES support. [v2, idr]: Rename ctx parameter to mem_ctx Signed-off-by: Ian Romanick <ian.d.romanick@intel.com> Reviewed-by: Kenneth Graunke <kenneth@whitecape.org> Acked-by: Carl Worth <cworth@cworth.org>
2012-08-01 18:36:57 -07:00
/**
* Format a short human-readable description of the given GLSL version.
*/
const char *
glsl_compute_version_string(void *mem_ctx, bool is_es, unsigned version)
{
return ralloc_asprintf(mem_ctx, "GLSL%s %d.%02d", is_es ? " ES" : "",
version / 100, version % 100);
}
glsl: Fix unsupported version error for GLSL ES 3.00, future proof for 3.30. When the user specifies an unsupported GLSL version, _mesa_glsl_parse_state::process_version_directive() nicely gives them an error message telling them which GLSL versions are supported. Previous to this patch, the logic for determining whether a given language version was supported was independent from the logic to generate this error message string; as a result, we had a bug where GLSL 3.00 would never be listed in the error message as an available language version, even if it was really available. To make matters worse, the code for generating the error message string assumed that desktop GL versions were always separated by 0.10, an assumption that will be wrong as soon as we support GLSL 3.30. This patch fixes both problems by adding a table of supported GLSL versions to _mesa_glsl_parse_state; this table is used both to generate the error message and to check whether a given version is supported. Reviewed-by: Ian Romanick <ian.d.romanick@intel.com>
2013-02-05 15:07:26 -08:00
static unsigned known_desktop_glsl_versions[] =
{ 110, 120, 130, 140, 150, 330, 400, 410, 420, 430 };
glsl: add gl_context member Reviewed-by: Brian Paul <brianp@vmware.com>
2012-04-02 16:14:31 +00:00
_mesa_glsl_parse_state::_mesa_glsl_parse_state(struct gl_context *_ctx,
glsl2: Add a constructor for _mesa_glsl_parse_state Coming changes to the handling of built-in functions necessitate this.
2010-07-18 15:59:43 -07:00
GLenum target, void *mem_ctx)
glsl: Initialize all member variables of _mesa_glsl_parse_state on construction. The _mesa_glsl_parse_state object relies on the memory allocator zeroing out its contents before it's initialized, which is quite an unusual practice in the C++ world because it ties objects to some specific allocation scheme, and gives unpredictable results when an object is created with a different allocator -- Stack allocation, array allocation, or aggregation inside a different object are some of the useful possibilities that come to my mind. Initialize all fields from the constructor and stop using the zeroing allocator. Reviewed-by: Paul Berry <stereotype441@gmail.com> Reviewed-by: Chad Versace <chad.versace@linux.intel.com> Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
2013-09-11 20:07:53 -07:00
: ctx(_ctx), switch_state()
glsl2: Add a constructor for _mesa_glsl_parse_state Coming changes to the handling of built-in functions necessitate this.
2010-07-18 15:59:43 -07:00
{
switch (target) {
glsl: Replace _mesa_glsl_parser_targets enum with gl_shader_type. These enums were redundant. Reviewed-by: Brian Paul <brianp@vmware.com>
2013-12-16 13:09:20 -08:00
case GL_VERTEX_SHADER: this->target = MESA_SHADER_VERTEX; break;
case GL_FRAGMENT_SHADER: this->target = MESA_SHADER_FRAGMENT; break;
case GL_GEOMETRY_SHADER: this->target = MESA_SHADER_GEOMETRY; break;
glsl2: Add a constructor for _mesa_glsl_parse_state Coming changes to the handling of built-in functions necessitate this.
2010-07-18 15:59:43 -07:00
}
this->scanner = NULL;
this->translation_unit.make_empty();
this->symbols = new(mem_ctx) glsl_symbol_table;
glsl: Initialize all member variables of _mesa_glsl_parse_state on construction. The _mesa_glsl_parse_state object relies on the memory allocator zeroing out its contents before it's initialized, which is quite an unusual practice in the C++ world because it ties objects to some specific allocation scheme, and gives unpredictable results when an object is created with a different allocator -- Stack allocation, array allocation, or aggregation inside a different object are some of the useful possibilities that come to my mind. Initialize all fields from the constructor and stop using the zeroing allocator. Reviewed-by: Paul Berry <stereotype441@gmail.com> Reviewed-by: Chad Versace <chad.versace@linux.intel.com> Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
2013-09-11 20:07:53 -07:00
this->num_uniform_blocks = 0;
this->uniform_block_array_size = 0;
this->uniform_blocks = NULL;
Convert everything from the talloc API to the ralloc API.
2011-01-21 14:32:31 -08:00
this->info_log = ralloc_strdup(mem_ctx, "");
glsl2: Add a constructor for _mesa_glsl_parse_state Coming changes to the handling of built-in functions necessitate this.
2010-07-18 15:59:43 -07:00
this->error = false;
glsl: Generate IR for switch statements Up until now modifying the GLSL compiler has been pretty straightforward. This is where things get interesting. But still pretty straightforward. Switch statements can be thought of a series of if/then/else statements. Case labels are compared with the value of a test expression and the case statements are executed if the comparison is true. There are a couple of aspects of switch statements that complicate this simple view of the world. The primary one is that cases can fall through sequentially to subsequent case, unless a break statement is encountered, in which case, the switch statement exits completely. But break handling is further complicated by the fact that a break statement can impact the exit of a loop. Thus, we need to coordinate break processing between switch statements and loop statements. The code generated by a switch statement maintains three temporary state variables: int test_value; bool is_fallthru; bool is_break; test_value is initialized to the value of the test expression at the head of the switch statement. This is the value that case labels are compared against. is_fallthru is used to sequentially fall through to subsequent cases and is initialized to false. When a case label matches the test expression, this state variable is set to true. It will also be forced to false if a break statement has been encountered. This forcing to false on break MUST be after every case test. In practice, we defer that forcing to immediately after the last case comparison prior to executing a case statement, but that is an optimization. is_break is used to indicate that a break statement has been executed and is initialized to false. When a break statement is encountered, it is set to true. This state variable is then used to conditionally force is_fallthru to to false to prevent subsequent case statements from executing. Code generation for break statements depends on whether the break statement is inside a switch statement or inside a loop statement. If it inside a loop statement is inside a break statement, the same code as before gets generated. But if a switch statement is inside a loop statement, code is emitted to set the is_break state to true. Just as ASTs for loop statements are managed in a stack-like manner to handle nesting, we also add a bool to capture the innermost switch or loop condition. Note that we still need to maintain a loop AST stack to properly handle for-loop code generation on a continue statement. Technically, we don't (yet) need a switch AST stack, but I am using one for orthogonality with loop statements, in anticipation of future use. Note that a simple boolean stack would have sufficed. We will illustrate a switch statement with its analogous conditional code that a switch statement corresponds to by examining an example. Consider the following switch statement: switch (42) { case 0: case 1: gl_FragColor = vec4(1.0, 2.0, 3.0, 4.0); case 2: case 3: gl_FragColor = vec4(4.0, 3.0, 2.0, 1.0); break; case 4: default: gl_FragColor = vec4(0.0, 0.0, 0.0, 0.0); } Note that case 0 and case 1 fall through to cases 2 and 3 if they occur. Note that case 4 and the default case must be reached explicitly, since cases 2 and 3 break at the end of their case. Finally, note that case 4 and the default case don't break but simply fall through to the end of the switch. For this code, the equivalent code can be expressed as: int test_val = 42; // capture value of test expression bool is_fallthru = false; // prevent initial fall through bool is_break = false; // capture the execution of a break stmt is_fallthru |= (test_val == 0); // enable fallthru on case 0 is_fallthru |= (test_val == 1); // enable fallthru on case 1 is_fallthru &= !is_break; // inhibit fallthru on previous break if (is_fallthru) { gl_FragColor = vec4(1.0, 2.0, 3.0, 4.0); } is_fallthru |= (test_val == 2); // enable fallthru on case 2 is_fallthru |= (test_val == 3); // enable fallthru on case 3 is_fallthru &= !is_break; // inhibit fallthru on previous break if (is_fallthru) { gl_FragColor = vec4(4.0, 3.0, 2.0, 1.0); is_break = true; // inhibit all subsequent fallthru for break } is_fallthru |= (test_val == 4); // enable fallthru on case 4 is_fallthru = true; // enable fallthru for default case is_fallthru &= !is_break; // inhibit fallthru on previous break if (is_fallthru) { gl_FragColor = vec4(0.0, 0.0, 0.0, 0.0); } The code generate for |= and &= uses the conditional assignment capabilities of the IR. Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
2011-11-07 16:17:58 -08:00
this->loop_nesting_ast = NULL;
glsl: Set default language version in mesa_glsl_parse_state constructor. This should make it easier to change the default version based on the API (say, version 1.00 for OpenGL ES). Also, synchronize the symbol table's version with the parse state's version just before doing AST-to-HIR. This way, it will be set when it matters, but the main initialization code doesn't have to care about the symbol table.
2010-09-05 00:31:28 -07:00
glsl: Disallow embedded structure definitions Continue to allow them in GLSL 1.10 because the spec allows it. Generate an error in all other versions because the specs specifically disallow it. Signed-off-by: Ian Romanick <ian.d.romanick@intel.com> Reviewed-by: Kenneth Graunke <kenneth@whitecape.org> Cc: "9.2" <mesa-stable@lists.freedesktop.org>
2013-08-13 09:15:01 -07:00
this->struct_specifier_depth = 0;
glsl: Simplify the built-in function linking code. Previously, we stored an array of up to 16 additional shaders to link, as well as a count of how many each shader actually needed. Since the built-in functions rewrite, all the built-ins are stored in a single shader. So all we need is a boolean indicating whether a shader needs to link against built-ins or not. During linking, we can avoid creating the temporary array if none of the shaders being linked need built-ins. Otherwise, it's simply a copy of the array that has one additional element. This is much simpler. This patch saves approximately 128 bytes of memory per gl_shader object. Signed-off-by: Kenneth Graunke <kenneth@whitecape.org> Reviewed-by: Ian Romanick <ian.d.romanick@intel.com>
2013-11-23 12:11:34 -08:00
this->uses_builtin_functions = false;
glsl: Defer initialization of built-in functions until they're needed. Very simple shaders don't actually use GLSL built-ins. For example: - gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex; - gl_FragColor = vec4(0.0); Both of the shaders used by _mesa_meta_glsl_Clear() also qualify. By waiting to initialize the built-ins until the first time we need to look for a signature, we can avoid the overhead entirely in these cases. Makes piglit run roughly 18% faster (255 vs. 312 seconds). Signed-off-by: Kenneth Graunke <kenneth@whitecape.org> Reviewed-by: Eric Anholt <eric@anholt.net>
2011-09-19 18:30:15 -07:00
glsl: Set default language version in mesa_glsl_parse_state constructor. This should make it easier to change the default version based on the API (say, version 1.00 for OpenGL ES). Also, synchronize the symbol table's version with the parse state's version just before doing AST-to-HIR. This way, it will be set when it matters, but the main initialization code doesn't have to care about the symbol table.
2010-09-05 00:31:28 -07:00
/* Set default language version and extensions */
mesa,glsl,st/dri: add a new driconf option force_glsl_version for Unigine See documentation in mtypes.h. Reviewed-by: Kenneth Graunke <kenneth@whitecape.org> Reviewed-by: Brian Paul <brianp@vmware.com> Reviewed-by: Ian Romanick <ian.d.romanick@intel.com>
2013-07-30 22:29:24 +02:00
this->language_version = ctx->Const.ForceGLSLVersion ?
ctx->Const.ForceGLSLVersion : 110;
glsl: Accept language version 100 and make it the default on ES2.
2010-08-16 12:34:53 -07:00
this->es_shader = false;
glsl2: Add a constructor for _mesa_glsl_parse_state Coming changes to the handling of built-in functions necessitate this.
2010-07-18 15:59:43 -07:00
this->ARB_texture_rectangle_enable = true;
glsl: Require a context in _mesa_glsl_parse_state. Create a dummy context in the standalone compiler and pass it to _mesa_glsl_parse_state.
2010-09-08 18:48:12 +08:00
/* OpenGL ES 2.0 has different defaults from desktop GL. */
if (ctx->API == API_OPENGLES2) {
this->language_version = 100;
this->es_shader = true;
this->ARB_texture_rectangle_enable = false;
glsl2: Add a constructor for _mesa_glsl_parse_state Coming changes to the handling of built-in functions necessitate this.
2010-07-18 15:59:43 -07:00
}
glsl: Require a context in _mesa_glsl_parse_state. Create a dummy context in the standalone compiler and pass it to _mesa_glsl_parse_state.
2010-09-08 18:48:12 +08:00
this->extensions = &ctx->Extensions;
this->Const.MaxLights = ctx->Const.MaxLights;
this->Const.MaxClipPlanes = ctx->Const.MaxClipPlanes;
this->Const.MaxTextureUnits = ctx->Const.MaxTextureUnits;
this->Const.MaxTextureCoords = ctx->Const.MaxTextureCoordUnits;
this->Const.MaxVertexAttribs = ctx->Const.VertexProgram.MaxAttribs;
this->Const.MaxVertexUniformComponents = ctx->Const.VertexProgram.MaxUniformComponents;
mesa: move max texture image unit constants to gl_program_constants Const.MaxTextureImageUnits -> Const.FragmentProgram.MaxTextureImageUnits Const.MaxVertexTextureImageUnits -> Const.VertexProgram.MaxTextureImageUnits etc. Reviewed-by: Kenneth Graunke <kenneth@whitecape.org> Reviewed-by: Brian Paul <brianp@vmware.com> Reviewed-by: Eric Anholt <eric@anholt.net>
2013-05-02 02:30:44 +02:00
this->Const.MaxVertexTextureImageUnits = ctx->Const.VertexProgram.MaxTextureImageUnits;
glsl: Require a context in _mesa_glsl_parse_state. Create a dummy context in the standalone compiler and pass it to _mesa_glsl_parse_state.
2010-09-08 18:48:12 +08:00
this->Const.MaxCombinedTextureImageUnits = ctx->Const.MaxCombinedTextureImageUnits;
mesa: move max texture image unit constants to gl_program_constants Const.MaxTextureImageUnits -> Const.FragmentProgram.MaxTextureImageUnits Const.MaxVertexTextureImageUnits -> Const.VertexProgram.MaxTextureImageUnits etc. Reviewed-by: Kenneth Graunke <kenneth@whitecape.org> Reviewed-by: Brian Paul <brianp@vmware.com> Reviewed-by: Eric Anholt <eric@anholt.net>
2013-05-02 02:30:44 +02:00
this->Const.MaxTextureImageUnits = ctx->Const.FragmentProgram.MaxTextureImageUnits;
glsl: Require a context in _mesa_glsl_parse_state. Create a dummy context in the standalone compiler and pass it to _mesa_glsl_parse_state.
2010-09-08 18:48:12 +08:00
this->Const.MaxFragmentUniformComponents = ctx->Const.FragmentProgram.MaxUniformComponents;
glsl: Make {Min,Max}ProgramTexelOffset available to compiler. These constants need to be made available to shaders in GLSL 3.00 ES. Reviewed-by: Ian Romanick <ian.d.romanick@intel.com> Reviewed-by: Kenneth Graunke <kenneth@whitecape.org> Reviewed-by: Eric Anholt <eric@anholt.net> Acked-by: Carl Worth <cworth@cworth.org>
2012-08-04 10:00:20 -07:00
this->Const.MinProgramTexelOffset = ctx->Const.MinProgramTexelOffset;
this->Const.MaxProgramTexelOffset = ctx->Const.MaxProgramTexelOffset;
glsl: Require a context in _mesa_glsl_parse_state. Create a dummy context in the standalone compiler and pass it to _mesa_glsl_parse_state.
2010-09-08 18:48:12 +08:00
this->Const.MaxDrawBuffers = ctx->Const.MaxDrawBuffers;
glsl: Reject shader versions not supported by the implementation Previously we'd happily compile GLSL 1.30 shaders on any driver. We'd also happily compile GLSL 1.10 and 1.20 shaders in an ES2 context. This has been a long standing FINISHME in the compiler. NOTE: This is a candidate for the 7.9 and 7.10 branches
2011-01-31 15:02:24 -08:00
glsl: Add new GLSL 1.50 constants. This patch populates the following built-in GLSL 1.50 variables based on constants stored in ctx->Const: - gl_MaxVertexOutputComponents - gl_MaxGeometryInputComponents - gl_MaxGeometryOutputComponents - gl_MaxFragmentInputComponents - gl_MaxGeometryTextureImageUnits - gl_MaxGeometryOutputVertices - gl_MaxGeometryTotalOutputComponents - gl_MaxGeometryUniformComponents - gl_MaxGeometryVaryingComponents On i965/gen7, fixes all Piglit tests in "spec/glsl-1.50/built-in constants/*" except for gl_MaxCombinedTextureImageUnits and gl_MaxGeometryUniformComponents. Reviewed-by: Matt Turner <mattst88@gmail.com>
2013-07-26 11:55:52 -07:00
/* 1.50 constants */
this->Const.MaxVertexOutputComponents = ctx->Const.VertexProgram.MaxOutputComponents;
this->Const.MaxGeometryInputComponents = ctx->Const.GeometryProgram.MaxInputComponents;
this->Const.MaxGeometryOutputComponents = ctx->Const.GeometryProgram.MaxOutputComponents;
this->Const.MaxFragmentInputComponents = ctx->Const.FragmentProgram.MaxInputComponents;
this->Const.MaxGeometryTextureImageUnits = ctx->Const.GeometryProgram.MaxTextureImageUnits;
this->Const.MaxGeometryOutputVertices = ctx->Const.MaxGeometryOutputVertices;
this->Const.MaxGeometryTotalOutputComponents = ctx->Const.MaxGeometryTotalOutputComponents;
this->Const.MaxGeometryUniformComponents = ctx->Const.GeometryProgram.MaxUniformComponents;
glsl: Add built-in functions and constants required for ARB_shader_atomic_counters. v2: Represent atomics as GLSL intrinsics. Reviewed-by: Ian Romanick <ian.d.romanick@intel.com>
2013-10-20 12:39:16 -07:00
this->Const.MaxVertexAtomicCounters = ctx->Const.VertexProgram.MaxAtomicCounters;
this->Const.MaxGeometryAtomicCounters = ctx->Const.GeometryProgram.MaxAtomicCounters;
this->Const.MaxFragmentAtomicCounters = ctx->Const.FragmentProgram.MaxAtomicCounters;
this->Const.MaxCombinedAtomicCounters = ctx->Const.MaxCombinedAtomicCounters;
this->Const.MaxAtomicBufferBindings = ctx->Const.MaxAtomicBufferBindings;
glsl: Initialize all member variables of _mesa_glsl_parse_state on construction. The _mesa_glsl_parse_state object relies on the memory allocator zeroing out its contents before it's initialized, which is quite an unusual practice in the C++ world because it ties objects to some specific allocation scheme, and gives unpredictable results when an object is created with a different allocator -- Stack allocation, array allocation, or aggregation inside a different object are some of the useful possibilities that come to my mind. Initialize all fields from the constructor and stop using the zeroing allocator. Reviewed-by: Paul Berry <stereotype441@gmail.com> Reviewed-by: Chad Versace <chad.versace@linux.intel.com> Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
2013-09-11 20:07:53 -07:00
this->current_function = NULL;
this->toplevel_ir = NULL;
this->found_return = false;
this->all_invariant = false;
this->user_structures = NULL;
this->num_user_structures = 0;
glsl: Fix unsupported version error for GLSL ES 3.00, future proof for 3.30. When the user specifies an unsupported GLSL version, _mesa_glsl_parse_state::process_version_directive() nicely gives them an error message telling them which GLSL versions are supported. Previous to this patch, the logic for determining whether a given language version was supported was independent from the logic to generate this error message string; as a result, we had a bug where GLSL 3.00 would never be listed in the error message as an available language version, even if it was really available. To make matters worse, the code for generating the error message string assumed that desktop GL versions were always separated by 0.10, an assumption that will be wrong as soon as we support GLSL 3.30. This patch fixes both problems by adding a table of supported GLSL versions to _mesa_glsl_parse_state; this table is used both to generate the error message and to check whether a given version is supported. Reviewed-by: Ian Romanick <ian.d.romanick@intel.com>
2013-02-05 15:07:26 -08:00
/* Populate the list of supported GLSL versions */
/* FINISHME: Once the OpenGL 3.0 'forward compatible' context or
* the OpenGL 3.2 Core context is supported, this logic will need
* change. Older versions of GLSL are no longer supported
* outside the compatibility contexts of 3.x.
*/
this->num_supported_versions = 0;
if (_mesa_is_desktop_gl(ctx)) {
for (unsigned i = 0; i < ARRAY_SIZE(known_desktop_glsl_versions); i++) {
if (known_desktop_glsl_versions[i] <= ctx->Const.GLSLVersion) {
this->supported_versions[this->num_supported_versions].ver
= known_desktop_glsl_versions[i];
this->supported_versions[this->num_supported_versions].es = false;
this->num_supported_versions++;
}
}
}
if (ctx->API == API_OPENGLES2 || ctx->Extensions.ARB_ES2_compatibility) {
this->supported_versions[this->num_supported_versions].ver = 100;
this->supported_versions[this->num_supported_versions].es = true;
this->num_supported_versions++;
}
if (_mesa_is_gles3(ctx) || ctx->Extensions.ARB_ES3_compatibility) {
this->supported_versions[this->num_supported_versions].ver = 300;
this->supported_versions[this->num_supported_versions].es = true;
this->num_supported_versions++;
}
assert(this->num_supported_versions
<= ARRAY_SIZE(this->supported_versions));
glsl: Reject shader versions not supported by the implementation Previously we'd happily compile GLSL 1.30 shaders on any driver. We'd also happily compile GLSL 1.10 and 1.20 shaders in an ES2 context. This has been a long standing FINISHME in the compiler. NOTE: This is a candidate for the 7.9 and 7.10 branches
2011-01-31 15:02:24 -08:00
glsl: Fix unsupported version error for GLSL ES 3.00, future proof for 3.30. When the user specifies an unsupported GLSL version, _mesa_glsl_parse_state::process_version_directive() nicely gives them an error message telling them which GLSL versions are supported. Previous to this patch, the logic for determining whether a given language version was supported was independent from the logic to generate this error message string; as a result, we had a bug where GLSL 3.00 would never be listed in the error message as an available language version, even if it was really available. To make matters worse, the code for generating the error message string assumed that desktop GL versions were always separated by 0.10, an assumption that will be wrong as soon as we support GLSL 3.30. This patch fixes both problems by adding a table of supported GLSL versions to _mesa_glsl_parse_state; this table is used both to generate the error message and to check whether a given version is supported. Reviewed-by: Ian Romanick <ian.d.romanick@intel.com>
2013-02-05 15:07:26 -08:00
/* Create a string for use in error messages to tell the user which GLSL
* versions are supported.
*/
char *supported = ralloc_strdup(this, "");
for (unsigned i = 0; i < this->num_supported_versions; i++) {
unsigned ver = this->supported_versions[i].ver;
const char *const prefix = (i == 0)
glsl: Reject shader versions not supported by the implementation Previously we'd happily compile GLSL 1.30 shaders on any driver. We'd also happily compile GLSL 1.10 and 1.20 shaders in an ES2 context. This has been a long standing FINISHME in the compiler. NOTE: This is a candidate for the 7.9 and 7.10 branches
2011-01-31 15:02:24 -08:00
? ""
glsl: Fix unsupported version error for GLSL ES 3.00, future proof for 3.30. When the user specifies an unsupported GLSL version, _mesa_glsl_parse_state::process_version_directive() nicely gives them an error message telling them which GLSL versions are supported. Previous to this patch, the logic for determining whether a given language version was supported was independent from the logic to generate this error message string; as a result, we had a bug where GLSL 3.00 would never be listed in the error message as an available language version, even if it was really available. To make matters worse, the code for generating the error message string assumed that desktop GL versions were always separated by 0.10, an assumption that will be wrong as soon as we support GLSL 3.30. This patch fixes both problems by adding a table of supported GLSL versions to _mesa_glsl_parse_state; this table is used both to generate the error message and to check whether a given version is supported. Reviewed-by: Ian Romanick <ian.d.romanick@intel.com>
2013-02-05 15:07:26 -08:00
: ((i == this->num_supported_versions - 1) ? ", and " : ", ");
const char *const suffix = (this->supported_versions[i].es) ? " ES" : "";
glsl: Reject shader versions not supported by the implementation Previously we'd happily compile GLSL 1.30 shaders on any driver. We'd also happily compile GLSL 1.10 and 1.20 shaders in an ES2 context. This has been a long standing FINISHME in the compiler. NOTE: This is a candidate for the 7.9 and 7.10 branches
2011-01-31 15:02:24 -08:00
glsl: Fix unsupported version error for GLSL ES 3.00, future proof for 3.30. When the user specifies an unsupported GLSL version, _mesa_glsl_parse_state::process_version_directive() nicely gives them an error message telling them which GLSL versions are supported. Previous to this patch, the logic for determining whether a given language version was supported was independent from the logic to generate this error message string; as a result, we had a bug where GLSL 3.00 would never be listed in the error message as an available language version, even if it was really available. To make matters worse, the code for generating the error message string assumed that desktop GL versions were always separated by 0.10, an assumption that will be wrong as soon as we support GLSL 3.30. This patch fixes both problems by adding a table of supported GLSL versions to _mesa_glsl_parse_state; this table is used both to generate the error message and to check whether a given version is supported. Reviewed-by: Ian Romanick <ian.d.romanick@intel.com>
2013-02-05 15:07:26 -08:00
ralloc_asprintf_append(& supported, "%s%u.%02u%s",
glsl: Reject shader versions not supported by the implementation Previously we'd happily compile GLSL 1.30 shaders on any driver. We'd also happily compile GLSL 1.10 and 1.20 shaders in an ES2 context. This has been a long standing FINISHME in the compiler. NOTE: This is a candidate for the 7.9 and 7.10 branches
2011-01-31 15:02:24 -08:00
prefix,
ver / 100, ver % 100,
glsl: Fix unsupported version error for GLSL ES 3.00, future proof for 3.30. When the user specifies an unsupported GLSL version, _mesa_glsl_parse_state::process_version_directive() nicely gives them an error message telling them which GLSL versions are supported. Previous to this patch, the logic for determining whether a given language version was supported was independent from the logic to generate this error message string; as a result, we had a bug where GLSL 3.00 would never be listed in the error message as an available language version, even if it was really available. To make matters worse, the code for generating the error message string assumed that desktop GL versions were always separated by 0.10, an assumption that will be wrong as soon as we support GLSL 3.30. This patch fixes both problems by adding a table of supported GLSL versions to _mesa_glsl_parse_state; this table is used both to generate the error message and to check whether a given version is supported. Reviewed-by: Ian Romanick <ian.d.romanick@intel.com>
2013-02-05 15:07:26 -08:00
suffix);
glsl: Reject shader versions not supported by the implementation Previously we'd happily compile GLSL 1.30 shaders on any driver. We'd also happily compile GLSL 1.10 and 1.20 shaders in an ES2 context. This has been a long standing FINISHME in the compiler. NOTE: This is a candidate for the 7.9 and 7.10 branches
2011-01-31 15:02:24 -08:00
}
this->supported_version_string = supported;
mesa: Add a flag for forcing all GLSL extensions to "warn". NOTE: This is a candidate for the 8.0 branch. Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
2012-01-18 12:14:09 -08:00
if (ctx->Const.ForceGLSLExtensionsWarn)
_mesa_glsl_process_extension("all", NULL, "warn", NULL, this);
glsl: Add support for default layout qualifiers for uniforms. I ended up having to add rallocing of the ast_type_qualifier in order to avoid pulling in ast.h for glsl_parser_extras.h, because I wanted to track an ast_type_qualifier in the state. Fixes piglit ARB_uniform_buffer_object/row-major. Reviewed-by: Kenneth Graunke <kenneth@whitecape.org> Reviewed-by: Ian Romanick <ian.d.romanick@intel.com>
2012-06-22 13:36:35 -07:00
this->default_uniform_qualifier = new(this) ast_type_qualifier();
this->default_uniform_qualifier->flags.q.shared = 1;
this->default_uniform_qualifier->flags.q.column_major = 1;
glsl: Parse the GLSL 1.50 GS layout qualifiers. Limited semantic checking (compatibility between declarations, checking that they're in the right shader target, etc.) is done. v2: Remove stray debug printfs. v3 (Paul Berry <stereotype441@gmail.com>): Process input layout qualifiers at ast_to_hir time rather than at parse time, since certain error conditions depend on the relative ordering between input layout qualifiers, declarations, and calls to .length(). Reviewed-by: Ian Romanick <ian.d.romanick@intel.com> Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
2013-06-12 14:03:49 -07:00
this->gs_input_prim_type_specified = false;
this->gs_input_prim_type = GL_POINTS;
glsl: Initialize all member variables of _mesa_glsl_parse_state on construction. The _mesa_glsl_parse_state object relies on the memory allocator zeroing out its contents before it's initialized, which is quite an unusual practice in the C++ world because it ties objects to some specific allocation scheme, and gives unpredictable results when an object is created with a different allocator -- Stack allocation, array allocation, or aggregation inside a different object are some of the useful possibilities that come to my mind. Initialize all fields from the constructor and stop using the zeroing allocator. Reviewed-by: Paul Berry <stereotype441@gmail.com> Reviewed-by: Chad Versace <chad.versace@linux.intel.com> Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
2013-09-11 20:07:53 -07:00
this->gs_input_size = 0;
glsl: Parse the GLSL 1.50 GS layout qualifiers. Limited semantic checking (compatibility between declarations, checking that they're in the right shader target, etc.) is done. v2: Remove stray debug printfs. v3 (Paul Berry <stereotype441@gmail.com>): Process input layout qualifiers at ast_to_hir time rather than at parse time, since certain error conditions depend on the relative ordering between input layout qualifiers, declarations, and calls to .length(). Reviewed-by: Ian Romanick <ian.d.romanick@intel.com> Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
2013-06-12 14:03:49 -07:00
this->out_qualifier = new(this) ast_type_qualifier();
glsl: Initialize _mesa_glsl_parse_state::atomic_counter_offsets before using it. Cc: Ian Romanick <ian.d.romanick@intel.com> Cc: "10.0" <mesa-stable@lists.freedesktop.org> Reviewed-by: Ian Romanick <ian.d.romanick@intel.com>
2013-11-26 12:43:13 -08:00
memset(this->atomic_counter_offsets, 0,
sizeof(this->atomic_counter_offsets));
glsl2: Add a constructor for _mesa_glsl_parse_state Coming changes to the handling of built-in functions necessitate this.
2010-07-18 15:59:43 -07:00
}
glsl: Add GLSL version query functions. With the advent of GLSL 3.00 ES, the version checks we perform in the GLSL compiler (to determine which language features are present) will become more complicated. To reduce the complexity, this patch adds functions check_version() and is_version() to _mesa_glsl_parse_state. These functions take two version numbers: a desktop GLSL version and a GLSL ES version, and return a boolean indicating whether the GLSL version being compiled is at least the required version. So, for example, is_version(130, 300) returns true if the GLSL version being compiled is at least desktop GLSL 1.30 or GLSL 3.00. The check_version() function additionally produces an error message if the version check fails, informing the user of which GLSL version(s) support the given feature. [v2, idr]: Add PRINTFLIKE annotation to the new method. The numbering of th parameters is correct because GCC is silly. [v3, idr]: Fix copy-and-paste error in the comment before _mesa_glsl_parse_state::is_version. Noticed by Ken. Signed-off-by: Ian Romanick <ian.d.romanick@intel.com> Reviewed-by: Kenneth Graunke <kenneth@whitecape.org> Acked-by: Carl Worth <cworth@cworth.org>
2012-08-01 19:09:24 -07:00
/**
* Determine whether the current GLSL version is sufficiently high to support
* a certain feature, and generate an error message if it isn't.
*
* \param required_glsl_version and \c required_glsl_es_version are
* interpreted as they are in _mesa_glsl_parse_state::is_version().
*
* \param locp is the parser location where the error should be reported.
*
* \param fmt (and additional arguments) constitute a printf-style error
* message to report if the version check fails. Information about the
* current and required GLSL versions will be appended. So, for example, if
* the GLSL version being compiled is 1.20, and check_version(130, 300, locp,
* "foo unsupported") is called, the error message will be "foo unsupported in
* GLSL 1.20 (GLSL 1.30 or GLSL 3.00 ES required)".
*/
bool
_mesa_glsl_parse_state::check_version(unsigned required_glsl_version,
unsigned required_glsl_es_version,
YYLTYPE *locp, const char *fmt, ...)
{
if (this->is_version(required_glsl_version, required_glsl_es_version))
return true;
va_list args;
va_start(args, fmt);
glsl_parser_extras.cpp: fixup gl vs mem contexts again. This should fix: https://bugs.freedesktop.org/show_bug.cgi?id=58039 Tested-by: Darxus on bug 58039 Reviewed-by: Kenneth Graunke <kenneth@whitecape.org> Signed-off-by: Dave Airlie <airlied@redhat.com>
2012-12-16 11:47:01 +10:00
char *problem = ralloc_vasprintf(this, fmt, args);
glsl: Add GLSL version query functions. With the advent of GLSL 3.00 ES, the version checks we perform in the GLSL compiler (to determine which language features are present) will become more complicated. To reduce the complexity, this patch adds functions check_version() and is_version() to _mesa_glsl_parse_state. These functions take two version numbers: a desktop GLSL version and a GLSL ES version, and return a boolean indicating whether the GLSL version being compiled is at least the required version. So, for example, is_version(130, 300) returns true if the GLSL version being compiled is at least desktop GLSL 1.30 or GLSL 3.00. The check_version() function additionally produces an error message if the version check fails, informing the user of which GLSL version(s) support the given feature. [v2, idr]: Add PRINTFLIKE annotation to the new method. The numbering of th parameters is correct because GCC is silly. [v3, idr]: Fix copy-and-paste error in the comment before _mesa_glsl_parse_state::is_version. Noticed by Ken. Signed-off-by: Ian Romanick <ian.d.romanick@intel.com> Reviewed-by: Kenneth Graunke <kenneth@whitecape.org> Acked-by: Carl Worth <cworth@cworth.org>
2012-08-01 19:09:24 -07:00
va_end(args);
const char *glsl_version_string
glsl: Fix gl_context vs. ralloc context in check_version again, again. Dave found some, but there were more. Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=58039
2012-12-17 11:20:53 -08:00
= glsl_compute_version_string(this, false, required_glsl_version);
glsl: Add GLSL version query functions. With the advent of GLSL 3.00 ES, the version checks we perform in the GLSL compiler (to determine which language features are present) will become more complicated. To reduce the complexity, this patch adds functions check_version() and is_version() to _mesa_glsl_parse_state. These functions take two version numbers: a desktop GLSL version and a GLSL ES version, and return a boolean indicating whether the GLSL version being compiled is at least the required version. So, for example, is_version(130, 300) returns true if the GLSL version being compiled is at least desktop GLSL 1.30 or GLSL 3.00. The check_version() function additionally produces an error message if the version check fails, informing the user of which GLSL version(s) support the given feature. [v2, idr]: Add PRINTFLIKE annotation to the new method. The numbering of th parameters is correct because GCC is silly. [v3, idr]: Fix copy-and-paste error in the comment before _mesa_glsl_parse_state::is_version. Noticed by Ken. Signed-off-by: Ian Romanick <ian.d.romanick@intel.com> Reviewed-by: Kenneth Graunke <kenneth@whitecape.org> Acked-by: Carl Worth <cworth@cworth.org>
2012-08-01 19:09:24 -07:00
const char *glsl_es_version_string
glsl: Fix gl_context vs. ralloc context in check_version again, again. Dave found some, but there were more. Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=58039
2012-12-17 11:20:53 -08:00
= glsl_compute_version_string(this, true, required_glsl_es_version);
glsl: Add GLSL version query functions. With the advent of GLSL 3.00 ES, the version checks we perform in the GLSL compiler (to determine which language features are present) will become more complicated. To reduce the complexity, this patch adds functions check_version() and is_version() to _mesa_glsl_parse_state. These functions take two version numbers: a desktop GLSL version and a GLSL ES version, and return a boolean indicating whether the GLSL version being compiled is at least the required version. So, for example, is_version(130, 300) returns true if the GLSL version being compiled is at least desktop GLSL 1.30 or GLSL 3.00. The check_version() function additionally produces an error message if the version check fails, informing the user of which GLSL version(s) support the given feature. [v2, idr]: Add PRINTFLIKE annotation to the new method. The numbering of th parameters is correct because GCC is silly. [v3, idr]: Fix copy-and-paste error in the comment before _mesa_glsl_parse_state::is_version. Noticed by Ken. Signed-off-by: Ian Romanick <ian.d.romanick@intel.com> Reviewed-by: Kenneth Graunke <kenneth@whitecape.org> Acked-by: Carl Worth <cworth@cworth.org>
2012-08-01 19:09:24 -07:00
const char *requirement_string = "";
if (required_glsl_version && required_glsl_es_version) {
glsl_parser_extras.cpp: fixup gl vs mem contexts again. This should fix: https://bugs.freedesktop.org/show_bug.cgi?id=58039 Tested-by: Darxus on bug 58039 Reviewed-by: Kenneth Graunke <kenneth@whitecape.org> Signed-off-by: Dave Airlie <airlied@redhat.com>
2012-12-16 11:47:01 +10:00
requirement_string = ralloc_asprintf(this, " (%s or %s required)",
glsl: Add GLSL version query functions. With the advent of GLSL 3.00 ES, the version checks we perform in the GLSL compiler (to determine which language features are present) will become more complicated. To reduce the complexity, this patch adds functions check_version() and is_version() to _mesa_glsl_parse_state. These functions take two version numbers: a desktop GLSL version and a GLSL ES version, and return a boolean indicating whether the GLSL version being compiled is at least the required version. So, for example, is_version(130, 300) returns true if the GLSL version being compiled is at least desktop GLSL 1.30 or GLSL 3.00. The check_version() function additionally produces an error message if the version check fails, informing the user of which GLSL version(s) support the given feature. [v2, idr]: Add PRINTFLIKE annotation to the new method. The numbering of th parameters is correct because GCC is silly. [v3, idr]: Fix copy-and-paste error in the comment before _mesa_glsl_parse_state::is_version. Noticed by Ken. Signed-off-by: Ian Romanick <ian.d.romanick@intel.com> Reviewed-by: Kenneth Graunke <kenneth@whitecape.org> Acked-by: Carl Worth <cworth@cworth.org>
2012-08-01 19:09:24 -07:00
glsl_version_string,
glsl_es_version_string);
} else if (required_glsl_version) {
glsl_parser_extras.cpp: fixup gl vs mem contexts again. This should fix: https://bugs.freedesktop.org/show_bug.cgi?id=58039 Tested-by: Darxus on bug 58039 Reviewed-by: Kenneth Graunke <kenneth@whitecape.org> Signed-off-by: Dave Airlie <airlied@redhat.com>
2012-12-16 11:47:01 +10:00
requirement_string = ralloc_asprintf(this, " (%s required)",
glsl: Add GLSL version query functions. With the advent of GLSL 3.00 ES, the version checks we perform in the GLSL compiler (to determine which language features are present) will become more complicated. To reduce the complexity, this patch adds functions check_version() and is_version() to _mesa_glsl_parse_state. These functions take two version numbers: a desktop GLSL version and a GLSL ES version, and return a boolean indicating whether the GLSL version being compiled is at least the required version. So, for example, is_version(130, 300) returns true if the GLSL version being compiled is at least desktop GLSL 1.30 or GLSL 3.00. The check_version() function additionally produces an error message if the version check fails, informing the user of which GLSL version(s) support the given feature. [v2, idr]: Add PRINTFLIKE annotation to the new method. The numbering of th parameters is correct because GCC is silly. [v3, idr]: Fix copy-and-paste error in the comment before _mesa_glsl_parse_state::is_version. Noticed by Ken. Signed-off-by: Ian Romanick <ian.d.romanick@intel.com> Reviewed-by: Kenneth Graunke <kenneth@whitecape.org> Acked-by: Carl Worth <cworth@cworth.org>
2012-08-01 19:09:24 -07:00
glsl_version_string);
} else if (required_glsl_es_version) {
glsl_parser_extras.cpp: fixup gl vs mem contexts again. This should fix: https://bugs.freedesktop.org/show_bug.cgi?id=58039 Tested-by: Darxus on bug 58039 Reviewed-by: Kenneth Graunke <kenneth@whitecape.org> Signed-off-by: Dave Airlie <airlied@redhat.com>
2012-12-16 11:47:01 +10:00
requirement_string = ralloc_asprintf(this, " (%s required)",
glsl: Add GLSL version query functions. With the advent of GLSL 3.00 ES, the version checks we perform in the GLSL compiler (to determine which language features are present) will become more complicated. To reduce the complexity, this patch adds functions check_version() and is_version() to _mesa_glsl_parse_state. These functions take two version numbers: a desktop GLSL version and a GLSL ES version, and return a boolean indicating whether the GLSL version being compiled is at least the required version. So, for example, is_version(130, 300) returns true if the GLSL version being compiled is at least desktop GLSL 1.30 or GLSL 3.00. The check_version() function additionally produces an error message if the version check fails, informing the user of which GLSL version(s) support the given feature. [v2, idr]: Add PRINTFLIKE annotation to the new method. The numbering of th parameters is correct because GCC is silly. [v3, idr]: Fix copy-and-paste error in the comment before _mesa_glsl_parse_state::is_version. Noticed by Ken. Signed-off-by: Ian Romanick <ian.d.romanick@intel.com> Reviewed-by: Kenneth Graunke <kenneth@whitecape.org> Acked-by: Carl Worth <cworth@cworth.org>
2012-08-01 19:09:24 -07:00
glsl_es_version_string);
}
glsl: Be consistent about '\n', '.', and capitalization in errors/warnings. The majority of calls to _mesa_glsl_error(), _mesa_glsl_warning(), and _mesa_glsl_parse_state::check_version() use a message that begins with a lower case letter and ends without a period. This patch makes all messages follow that convention. Also, error/warning messages shouldn't end in '\n', since _mesa_glsl_msg() automatically adds '\n' at the end of the message. Reviewed-by: Matt Turner <mattst88@gmail.com>
2013-07-25 19:56:43 -07:00
_mesa_glsl_error(locp, this, "%s in %s%s",
glsl: Add GLSL version query functions. With the advent of GLSL 3.00 ES, the version checks we perform in the GLSL compiler (to determine which language features are present) will become more complicated. To reduce the complexity, this patch adds functions check_version() and is_version() to _mesa_glsl_parse_state. These functions take two version numbers: a desktop GLSL version and a GLSL ES version, and return a boolean indicating whether the GLSL version being compiled is at least the required version. So, for example, is_version(130, 300) returns true if the GLSL version being compiled is at least desktop GLSL 1.30 or GLSL 3.00. The check_version() function additionally produces an error message if the version check fails, informing the user of which GLSL version(s) support the given feature. [v2, idr]: Add PRINTFLIKE annotation to the new method. The numbering of th parameters is correct because GCC is silly. [v3, idr]: Fix copy-and-paste error in the comment before _mesa_glsl_parse_state::is_version. Noticed by Ken. Signed-off-by: Ian Romanick <ian.d.romanick@intel.com> Reviewed-by: Kenneth Graunke <kenneth@whitecape.org> Acked-by: Carl Worth <cworth@cworth.org>
2012-08-01 19:09:24 -07:00
problem, this->get_version_string(),
requirement_string);
return false;
}
glsl/parser: Extract version directive processing into a function. Version directive handling is going to have to be used within two parser rules, one for desktop-style version directives (e.g. "#version 130") and one for the new ES-style version directive (e.g. "#version 300 es"), so this patch moves it to a function that can be called from both rules. No functional change. Reviewed-by: Ian Romanick <ian.d.romanick@intel.com> Reviewed-by: Kenneth Graunke <kenneth@whitecape.org> Acked-by: Carl Worth <cworth@cworth.org>
2012-08-02 11:02:55 -07:00
/**
* Process a GLSL #version directive.
*
* \param version is the integer that follows the #version token.
glsl/parser: Handle "#version 300 es" directive. Note that GLSL 1.00 is selected using "#version 100", so "#version 100 es" is prohibited. v2: Check for GLES3 before allowing '#version 300 es' v3: Make sure a correct language_version is set in _mesa_glsl_parse_state::process_version_directive. Signed-off-by: Paul Berry <stereotype441@gmail.com> Signed-off-by: Ian Romanick <ian.d.romanick@intel.com> Reviewed-by: Kenneth Graunke <kenneth@whitecape.org> Acked-by: Carl Worth <cworth@cworth.org>
2012-08-02 11:17:30 -07:00
*
* \param ident is a string identifier that follows the integer, if any is
* present. Otherwise NULL.
glsl/parser: Extract version directive processing into a function. Version directive handling is going to have to be used within two parser rules, one for desktop-style version directives (e.g. "#version 130") and one for the new ES-style version directive (e.g. "#version 300 es"), so this patch moves it to a function that can be called from both rules. No functional change. Reviewed-by: Ian Romanick <ian.d.romanick@intel.com> Reviewed-by: Kenneth Graunke <kenneth@whitecape.org> Acked-by: Carl Worth <cworth@cworth.org>
2012-08-02 11:02:55 -07:00
*/
void
glsl/parser: Handle "#version 300 es" directive. Note that GLSL 1.00 is selected using "#version 100", so "#version 100 es" is prohibited. v2: Check for GLES3 before allowing '#version 300 es' v3: Make sure a correct language_version is set in _mesa_glsl_parse_state::process_version_directive. Signed-off-by: Paul Berry <stereotype441@gmail.com> Signed-off-by: Ian Romanick <ian.d.romanick@intel.com> Reviewed-by: Kenneth Graunke <kenneth@whitecape.org> Acked-by: Carl Worth <cworth@cworth.org>
2012-08-02 11:17:30 -07:00
_mesa_glsl_parse_state::process_version_directive(YYLTYPE *locp, int version,
const char *ident)
glsl/parser: Extract version directive processing into a function. Version directive handling is going to have to be used within two parser rules, one for desktop-style version directives (e.g. "#version 130") and one for the new ES-style version directive (e.g. "#version 300 es"), so this patch moves it to a function that can be called from both rules. No functional change. Reviewed-by: Ian Romanick <ian.d.romanick@intel.com> Reviewed-by: Kenneth Graunke <kenneth@whitecape.org> Acked-by: Carl Worth <cworth@cworth.org>
2012-08-02 11:02:55 -07:00
{
glsl/parser: Handle "#version 300 es" directive. Note that GLSL 1.00 is selected using "#version 100", so "#version 100 es" is prohibited. v2: Check for GLES3 before allowing '#version 300 es' v3: Make sure a correct language_version is set in _mesa_glsl_parse_state::process_version_directive. Signed-off-by: Paul Berry <stereotype441@gmail.com> Signed-off-by: Ian Romanick <ian.d.romanick@intel.com> Reviewed-by: Kenneth Graunke <kenneth@whitecape.org> Acked-by: Carl Worth <cworth@cworth.org>
2012-08-02 11:17:30 -07:00
bool es_token_present = false;
if (ident) {
if (strcmp(ident, "es") == 0) {
es_token_present = true;
glsl: Parse "#version 150 core" directives. Previously we only supported "#version 150". This patch recognizes "compatibility" to give the user a more descriptive error message. Fixes Piglit's version-150-core-profile test. Reviewed-by: Matt Turner <mattst88@gmail.com> Signed-off-by: Kenneth Graunke <kenneth@whitecape.org>
2013-06-07 21:28:59 -07:00
} else if (version >= 150) {
if (strcmp(ident, "core") == 0) {
/* Accept the token. There's no need to record that this is
* a core profile shader since that's the only profile we support.
*/
} else if (strcmp(ident, "compatibility") == 0) {
_mesa_glsl_error(locp, this,
glsl: Be consistent about '\n', '.', and capitalization in errors/warnings. The majority of calls to _mesa_glsl_error(), _mesa_glsl_warning(), and _mesa_glsl_parse_state::check_version() use a message that begins with a lower case letter and ends without a period. This patch makes all messages follow that convention. Also, error/warning messages shouldn't end in '\n', since _mesa_glsl_msg() automatically adds '\n' at the end of the message. Reviewed-by: Matt Turner <mattst88@gmail.com>
2013-07-25 19:56:43 -07:00
"the compatibility profile is not supported");
glsl: Parse "#version 150 core" directives. Previously we only supported "#version 150". This patch recognizes "compatibility" to give the user a more descriptive error message. Fixes Piglit's version-150-core-profile test. Reviewed-by: Matt Turner <mattst88@gmail.com> Signed-off-by: Kenneth Graunke <kenneth@whitecape.org>
2013-06-07 21:28:59 -07:00
} else {
_mesa_glsl_error(locp, this,
"\"%s\" is not a valid shading language profile; "
glsl: Be consistent about '\n', '.', and capitalization in errors/warnings. The majority of calls to _mesa_glsl_error(), _mesa_glsl_warning(), and _mesa_glsl_parse_state::check_version() use a message that begins with a lower case letter and ends without a period. This patch makes all messages follow that convention. Also, error/warning messages shouldn't end in '\n', since _mesa_glsl_msg() automatically adds '\n' at the end of the message. Reviewed-by: Matt Turner <mattst88@gmail.com>
2013-07-25 19:56:43 -07:00
"if present, it must be \"core\"", ident);
glsl: Parse "#version 150 core" directives. Previously we only supported "#version 150". This patch recognizes "compatibility" to give the user a more descriptive error message. Fixes Piglit's version-150-core-profile test. Reviewed-by: Matt Turner <mattst88@gmail.com> Signed-off-by: Kenneth Graunke <kenneth@whitecape.org>
2013-06-07 21:28:59 -07:00
}
glsl/parser: Handle "#version 300 es" directive. Note that GLSL 1.00 is selected using "#version 100", so "#version 100 es" is prohibited. v2: Check for GLES3 before allowing '#version 300 es' v3: Make sure a correct language_version is set in _mesa_glsl_parse_state::process_version_directive. Signed-off-by: Paul Berry <stereotype441@gmail.com> Signed-off-by: Ian Romanick <ian.d.romanick@intel.com> Reviewed-by: Kenneth Graunke <kenneth@whitecape.org> Acked-by: Carl Worth <cworth@cworth.org>
2012-08-02 11:17:30 -07:00
} else {
_mesa_glsl_error(locp, this,
glsl: Be consistent about '\n', '.', and capitalization in errors/warnings. The majority of calls to _mesa_glsl_error(), _mesa_glsl_warning(), and _mesa_glsl_parse_state::check_version() use a message that begins with a lower case letter and ends without a period. This patch makes all messages follow that convention. Also, error/warning messages shouldn't end in '\n', since _mesa_glsl_msg() automatically adds '\n' at the end of the message. Reviewed-by: Matt Turner <mattst88@gmail.com>
2013-07-25 19:56:43 -07:00
"illegal text following version number");
glsl/parser: Handle "#version 300 es" directive. Note that GLSL 1.00 is selected using "#version 100", so "#version 100 es" is prohibited. v2: Check for GLES3 before allowing '#version 300 es' v3: Make sure a correct language_version is set in _mesa_glsl_parse_state::process_version_directive. Signed-off-by: Paul Berry <stereotype441@gmail.com> Signed-off-by: Ian Romanick <ian.d.romanick@intel.com> Reviewed-by: Kenneth Graunke <kenneth@whitecape.org> Acked-by: Carl Worth <cworth@cworth.org>
2012-08-02 11:17:30 -07:00
}
}
glsl: Fix unsupported version error for GLSL ES 3.00, future proof for 3.30. When the user specifies an unsupported GLSL version, _mesa_glsl_parse_state::process_version_directive() nicely gives them an error message telling them which GLSL versions are supported. Previous to this patch, the logic for determining whether a given language version was supported was independent from the logic to generate this error message string; as a result, we had a bug where GLSL 3.00 would never be listed in the error message as an available language version, even if it was really available. To make matters worse, the code for generating the error message string assumed that desktop GL versions were always separated by 0.10, an assumption that will be wrong as soon as we support GLSL 3.30. This patch fixes both problems by adding a table of supported GLSL versions to _mesa_glsl_parse_state; this table is used both to generate the error message and to check whether a given version is supported. Reviewed-by: Ian Romanick <ian.d.romanick@intel.com>
2013-02-05 15:07:26 -08:00
this->es_shader = es_token_present;
if (version == 100) {
if (es_token_present) {
glsl/parser: Handle "#version 300 es" directive. Note that GLSL 1.00 is selected using "#version 100", so "#version 100 es" is prohibited. v2: Check for GLES3 before allowing '#version 300 es' v3: Make sure a correct language_version is set in _mesa_glsl_parse_state::process_version_directive. Signed-off-by: Paul Berry <stereotype441@gmail.com> Signed-off-by: Ian Romanick <ian.d.romanick@intel.com> Reviewed-by: Kenneth Graunke <kenneth@whitecape.org> Acked-by: Carl Worth <cworth@cworth.org>
2012-08-02 11:17:30 -07:00
_mesa_glsl_error(locp, this,
"GLSL 1.00 ES should be selected using "
glsl: Be consistent about '\n', '.', and capitalization in errors/warnings. The majority of calls to _mesa_glsl_error(), _mesa_glsl_warning(), and _mesa_glsl_parse_state::check_version() use a message that begins with a lower case letter and ends without a period. This patch makes all messages follow that convention. Also, error/warning messages shouldn't end in '\n', since _mesa_glsl_msg() automatically adds '\n' at the end of the message. Reviewed-by: Matt Turner <mattst88@gmail.com>
2013-07-25 19:56:43 -07:00
"`#version 100'");
glsl: Fix unsupported version error for GLSL ES 3.00, future proof for 3.30. When the user specifies an unsupported GLSL version, _mesa_glsl_parse_state::process_version_directive() nicely gives them an error message telling them which GLSL versions are supported. Previous to this patch, the logic for determining whether a given language version was supported was independent from the logic to generate this error message string; as a result, we had a bug where GLSL 3.00 would never be listed in the error message as an available language version, even if it was really available. To make matters worse, the code for generating the error message string assumed that desktop GL versions were always separated by 0.10, an assumption that will be wrong as soon as we support GLSL 3.30. This patch fixes both problems by adding a table of supported GLSL versions to _mesa_glsl_parse_state; this table is used both to generate the error message and to check whether a given version is supported. Reviewed-by: Ian Romanick <ian.d.romanick@intel.com>
2013-02-05 15:07:26 -08:00
} else {
glsl/parser: Handle "#version 300 es" directive. Note that GLSL 1.00 is selected using "#version 100", so "#version 100 es" is prohibited. v2: Check for GLES3 before allowing '#version 300 es' v3: Make sure a correct language_version is set in _mesa_glsl_parse_state::process_version_directive. Signed-off-by: Paul Berry <stereotype441@gmail.com> Signed-off-by: Ian Romanick <ian.d.romanick@intel.com> Reviewed-by: Kenneth Graunke <kenneth@whitecape.org> Acked-by: Carl Worth <cworth@cworth.org>
2012-08-02 11:17:30 -07:00
this->es_shader = true;
}
glsl/parser: Extract version directive processing into a function. Version directive handling is going to have to be used within two parser rules, one for desktop-style version directives (e.g. "#version 130") and one for the new ES-style version directive (e.g. "#version 300 es"), so this patch moves it to a function that can be called from both rules. No functional change. Reviewed-by: Ian Romanick <ian.d.romanick@intel.com> Reviewed-by: Kenneth Graunke <kenneth@whitecape.org> Acked-by: Carl Worth <cworth@cworth.org>
2012-08-02 11:02:55 -07:00
}
this->language_version = version;
glsl: Fix unsupported version error for GLSL ES 3.00, future proof for 3.30. When the user specifies an unsupported GLSL version, _mesa_glsl_parse_state::process_version_directive() nicely gives them an error message telling them which GLSL versions are supported. Previous to this patch, the logic for determining whether a given language version was supported was independent from the logic to generate this error message string; as a result, we had a bug where GLSL 3.00 would never be listed in the error message as an available language version, even if it was really available. To make matters worse, the code for generating the error message string assumed that desktop GL versions were always separated by 0.10, an assumption that will be wrong as soon as we support GLSL 3.30. This patch fixes both problems by adding a table of supported GLSL versions to _mesa_glsl_parse_state; this table is used both to generate the error message and to check whether a given version is supported. Reviewed-by: Ian Romanick <ian.d.romanick@intel.com>
2013-02-05 15:07:26 -08:00
bool supported = false;
for (unsigned i = 0; i < this->num_supported_versions; i++) {
if (this->supported_versions[i].ver == (unsigned) version
&& this->supported_versions[i].es == this->es_shader) {
supported = true;
break;
}
}
glsl/parser: Extract version directive processing into a function. Version directive handling is going to have to be used within two parser rules, one for desktop-style version directives (e.g. "#version 130") and one for the new ES-style version directive (e.g. "#version 300 es"), so this patch moves it to a function that can be called from both rules. No functional change. Reviewed-by: Ian Romanick <ian.d.romanick@intel.com> Reviewed-by: Kenneth Graunke <kenneth@whitecape.org> Acked-by: Carl Worth <cworth@cworth.org>
2012-08-02 11:02:55 -07:00
if (!supported) {
_mesa_glsl_error(locp, this, "%s is not supported. "
glsl: Be consistent about '\n', '.', and capitalization in errors/warnings. The majority of calls to _mesa_glsl_error(), _mesa_glsl_warning(), and _mesa_glsl_parse_state::check_version() use a message that begins with a lower case letter and ends without a period. This patch makes all messages follow that convention. Also, error/warning messages shouldn't end in '\n', since _mesa_glsl_msg() automatically adds '\n' at the end of the message. Reviewed-by: Matt Turner <mattst88@gmail.com>
2013-07-25 19:56:43 -07:00
"Supported versions are: %s",
glsl/parser: Extract version directive processing into a function. Version directive handling is going to have to be used within two parser rules, one for desktop-style version directives (e.g. "#version 130") and one for the new ES-style version directive (e.g. "#version 300 es"), so this patch moves it to a function that can be called from both rules. No functional change. Reviewed-by: Ian Romanick <ian.d.romanick@intel.com> Reviewed-by: Kenneth Graunke <kenneth@whitecape.org> Acked-by: Carl Worth <cworth@cworth.org>
2012-08-02 11:02:55 -07:00
this->get_version_string(),
this->supported_version_string);
glsl/parser: Handle "#version 300 es" directive. Note that GLSL 1.00 is selected using "#version 100", so "#version 100 es" is prohibited. v2: Check for GLES3 before allowing '#version 300 es' v3: Make sure a correct language_version is set in _mesa_glsl_parse_state::process_version_directive. Signed-off-by: Paul Berry <stereotype441@gmail.com> Signed-off-by: Ian Romanick <ian.d.romanick@intel.com> Reviewed-by: Kenneth Graunke <kenneth@whitecape.org> Acked-by: Carl Worth <cworth@cworth.org>
2012-08-02 11:17:30 -07:00
/* On exit, the language_version must be set to a valid value.
* Later calls to _mesa_glsl_initialize_types will misbehave if
* the version is invalid.
*/
switch (this->ctx->API) {
case API_OPENGL_COMPAT:
case API_OPENGL_CORE:
this->language_version = this->ctx->Const.GLSLVersion;
break;
case API_OPENGLES:
assert(!"Should not get here.");
/* FALLTHROUGH */
case API_OPENGLES2:
this->language_version = 100;
break;
}
glsl/parser: Extract version directive processing into a function. Version directive handling is going to have to be used within two parser rules, one for desktop-style version directives (e.g. "#version 130") and one for the new ES-style version directive (e.g. "#version 300 es"), so this patch moves it to a function that can be called from both rules. No functional change. Reviewed-by: Ian Romanick <ian.d.romanick@intel.com> Reviewed-by: Kenneth Graunke <kenneth@whitecape.org> Acked-by: Carl Worth <cworth@cworth.org>
2012-08-02 11:02:55 -07:00
}
}
mesa: Use shared code for converting shader targets to short strings. 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>
2013-06-12 16:57:11 -07:00
extern "C" {
/**
Rename overloads of _mesa_glsl_shader_target_name(). Previously, _mesa_glsl_shader_target_name() had an overload for GLenum and an overload for the gl_shader_type enum, each of which behaved differently. However, since GLenum is a synonym for unsigned int, and unsigned ints are often used in place of gl_shader_type (e.g. in loop indices), there was a big risk of calling the wrong overload by mistake. This patch gives the two overloads different names so that it's always clear which one we mean to call. Reviewed-by: Brian Paul <brianp@vmware.com>
2013-12-17 12:13:11 -08:00
* Translate a GLenum to a short shader stage name for debug printouts and
* error messages.
mesa: Use shared code for converting shader targets to short strings. 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>
2013-06-12 16:57:11 -07:00
*
* It recognizes the PROGRAM variants of the names so it can be used
* with a struct gl_program->Target, not just a struct
* gl_shader->Type.
*/
const char *
Rename overloads of _mesa_glsl_shader_target_name(). Previously, _mesa_glsl_shader_target_name() had an overload for GLenum and an overload for the gl_shader_type enum, each of which behaved differently. However, since GLenum is a synonym for unsigned int, and unsigned ints are often used in place of gl_shader_type (e.g. in loop indices), there was a big risk of calling the wrong overload by mistake. This patch gives the two overloads different names so that it's always clear which one we mean to call. Reviewed-by: Brian Paul <brianp@vmware.com>
2013-12-17 12:13:11 -08:00
_mesa_shader_enum_to_string(GLenum type)
mesa: Use shared code for converting shader targets to short strings. 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>
2013-06-12 16:57:11 -07:00
{
switch (type) {
case GL_VERTEX_SHADER:
case GL_VERTEX_PROGRAM_ARB:
return "vertex";
case GL_FRAGMENT_SHADER:
case GL_FRAGMENT_PROGRAM_ARB:
return "fragment";
case GL_GEOMETRY_SHADER:
return "geometry";
default:
assert(!"Should not get here.");
return "unknown";
}
}
} /* extern "C" */
/**
Rename overloads of _mesa_glsl_shader_target_name(). Previously, _mesa_glsl_shader_target_name() had an overload for GLenum and an overload for the gl_shader_type enum, each of which behaved differently. However, since GLenum is a synonym for unsigned int, and unsigned ints are often used in place of gl_shader_type (e.g. in loop indices), there was a big risk of calling the wrong overload by mistake. This patch gives the two overloads different names so that it's always clear which one we mean to call. Reviewed-by: Brian Paul <brianp@vmware.com>
2013-12-17 12:13:11 -08:00
* Translate a gl_shader_type to a short shader stage name for debug printouts
* and error messages.
mesa: Use shared code for converting shader targets to short strings. 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>
2013-06-12 16:57:11 -07:00
*/
Add utility function to get the name of a shader target
2010-04-07 16:44:30 -07:00
const char *
Rename overloads of _mesa_glsl_shader_target_name(). Previously, _mesa_glsl_shader_target_name() had an overload for GLenum and an overload for the gl_shader_type enum, each of which behaved differently. However, since GLenum is a synonym for unsigned int, and unsigned ints are often used in place of gl_shader_type (e.g. in loop indices), there was a big risk of calling the wrong overload by mistake. This patch gives the two overloads different names so that it's always clear which one we mean to call. Reviewed-by: Brian Paul <brianp@vmware.com>
2013-12-17 12:13:11 -08:00
_mesa_shader_type_to_string(unsigned target)
Add utility function to get the name of a shader target
2010-04-07 16:44:30 -07:00
{
switch (target) {
glsl: Replace _mesa_glsl_parser_targets enum with gl_shader_type. These enums were redundant. Reviewed-by: Brian Paul <brianp@vmware.com>
2013-12-16 13:09:20 -08:00
case MESA_SHADER_VERTEX: return "vertex";
case MESA_SHADER_FRAGMENT: return "fragment";
case MESA_SHADER_GEOMETRY: return "geometry";
Add utility function to get the name of a shader target
2010-04-07 16:44:30 -07:00
}
assert(!"Should not get here.");
glsl2: Fix warning from always-false assert not being known to not return.
2010-07-18 17:47:15 -07:00
return "unknown";
Add utility function to get the name of a shader target
2010-04-07 16:44:30 -07:00
}
glsl: consolidate error/warning code And lay the groundwork for GL_ARB_debug_output. v2: Add descriptive comments. Reviewed-by: Brian Paul <brianp@vmware.com>
2012-04-02 15:39:38 +00:00
/* This helper function will append the given message to the shader's
info log and report it via GL_ARB_debug_output. Per that extension,
'type' is one of the enum values classifying the message, and
'id' is the implementation-defined ID of the given message. */
static void
_mesa_glsl_msg(const YYLTYPE *locp, _mesa_glsl_parse_state *state,
mesa: Report ARB_debug_output for both shader errors and warnings. 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 <jordan.l.justen@intel.com>
2013-02-22 15:57:25 -08:00
GLenum type, const char *fmt, va_list ap)
glsl: consolidate error/warning code And lay the groundwork for GL_ARB_debug_output. v2: Add descriptive comments. Reviewed-by: Brian Paul <brianp@vmware.com>
2012-04-02 15:39:38 +00:00
{
mesa: Report ARB_debug_output for both shader errors and warnings. 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 <jordan.l.justen@intel.com>
2013-02-22 15:57:25 -08:00
bool error = (type == MESA_DEBUG_TYPE_ERROR);
GLuint msg_id = 0;
glsl: consolidate error/warning code And lay the groundwork for GL_ARB_debug_output. v2: Add descriptive comments. Reviewed-by: Brian Paul <brianp@vmware.com>
2012-04-02 15:39:38 +00:00
assert(state->info_log != NULL);
glsl: report errors via GL_ARB_debug_output Reviewed-by: Brian Paul <brianp@vmware.com>
2012-04-02 16:26:05 +00:00
/* Get the offset that the new message will be written to. */
int msg_offset = strlen(state->info_log);
glsl: consolidate error/warning code And lay the groundwork for GL_ARB_debug_output. v2: Add descriptive comments. Reviewed-by: Brian Paul <brianp@vmware.com>
2012-04-02 15:39:38 +00:00
ralloc_asprintf_append(&state->info_log, "%u:%u(%u): %s: ",
locp->source,
locp->first_line,
locp->first_column,
error ? "error" : "warning");
ralloc_vasprintf_append(&state->info_log, fmt, ap);
glsl: report errors via GL_ARB_debug_output Reviewed-by: Brian Paul <brianp@vmware.com>
2012-04-02 16:26:05 +00:00
const char *const msg = &state->info_log[msg_offset];
struct gl_context *ctx = state->ctx;
mesa: Report ARB_debug_output for both shader errors and warnings. 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 <jordan.l.justen@intel.com>
2013-02-22 15:57:25 -08:00
glsl: report errors via GL_ARB_debug_output Reviewed-by: Brian Paul <brianp@vmware.com>
2012-04-02 16:26:05 +00:00
/* Report the error via GL_ARB_debug_output. */
mesa: Report ARB_debug_output for both shader errors and warnings. 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 <jordan.l.justen@intel.com>
2013-02-22 15:57:25 -08:00
_mesa_shader_debug(ctx, type, &msg_id, msg, strlen(msg));
glsl: report errors via GL_ARB_debug_output Reviewed-by: Brian Paul <brianp@vmware.com>
2012-04-02 16:26:05 +00:00
glsl: consolidate error/warning code And lay the groundwork for GL_ARB_debug_output. v2: Add descriptive comments. Reviewed-by: Brian Paul <brianp@vmware.com>
2012-04-02 15:39:38 +00:00
ralloc_strcat(&state->info_log, "\n");
}
Add utility function to get the name of a shader target
2010-04-07 16:44:30 -07:00
Initial commit. lol
2010-02-22 13:19:34 -08:00
void
Track generation of errors and halt compilation appropriately
2010-03-11 14:08:33 -08:00
_mesa_glsl_error(YYLTYPE *locp, _mesa_glsl_parse_state *state,
const char *fmt, ...)
Initial commit. lol
2010-02-22 13:19:34 -08:00
{
va_list ap;
Disallow passing NULL for state to _mesa_glsl_error The two places that were still passing NULL had a state pointer to pass. Not passing it in these places prevented termination of compilation of erroneous programs.
2010-03-23 13:21:19 -07:00
state->error = true;
Track generation of errors and halt compilation appropriately
2010-03-11 14:08:33 -08:00
Initial commit. lol
2010-02-22 13:19:34 -08:00
va_start(ap, fmt);
mesa: Report ARB_debug_output for both shader errors and warnings. 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 <jordan.l.justen@intel.com>
2013-02-22 15:57:25 -08:00
_mesa_glsl_msg(locp, state, MESA_DEBUG_TYPE_ERROR, fmt, ap);
Initial commit. lol
2010-02-22 13:19:34 -08:00
va_end(ap);
}
Add _mesa_glsl_warning to emit warnings to the shader log
2010-04-07 14:47:46 -07:00
void
Store warnings and errors in a parser state infolog. Cleans up compile warning about unused state in _mesa_glsl_warning. We would want infolog handling roughly like this anyway.
2010-04-29 18:00:33 -07:00
_mesa_glsl_warning(const YYLTYPE *locp, _mesa_glsl_parse_state *state,
Add _mesa_glsl_warning to emit warnings to the shader log
2010-04-07 14:47:46 -07:00
const char *fmt, ...)
{
va_list ap;
va_start(ap, fmt);
mesa: Report ARB_debug_output for both shader errors and warnings. 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 <jordan.l.justen@intel.com>
2013-02-22 15:57:25 -08:00
_mesa_glsl_msg(locp, state, MESA_DEBUG_TYPE_OTHER, fmt, ap);
Add _mesa_glsl_warning to emit warnings to the shader log
2010-04-07 14:47:46 -07:00
va_end(ap);
}
glsl: Rewrote _mesa_glsl_process_extension to use table-driven logic. Instead of using a chain of manually maintained if/else blocks to handle "#extension" directives, we now consult a table that specifies, for each extension, the circumstances under which it is available, and what flags in _mesa_glsl_parse_state need to be set in order to activate it. This makes it easier to add new GLSL extensions in the future, and fixes the following bugs: - Previously, _mesa_glsl_process_extension would sometimes set the "_enable" and "_warn" flags for an extension before checking whether the extension was supported by the driver; as a result, specifying "enable" behavior for an unsupported extension would sometimes cause front-end support for that extension to be switched on in spite of the fact that back-end support was not available, leading to strange failures, such as those in https://bugs.freedesktop.org/show_bug.cgi?id=38015. - "#extension all: warn" and "#extension all: disable" had no effect. Notes: - All extensions are currently marked as unavailable in geometry shaders. This should not have any adverse effects since geometry shaders aren't supported yet. When we return to working on geometry shader support, we'll need to update the table for those extensions that are available in geometry shaders. - Previous to this commit, if a shader mentioned ARB_shader_texture_lod, extension ARB_texture_rectangle would be automatically turned on in order to ensure that the types sampler2DRect and sampler2DRectShadow would be defined. This was unnecessary, because (a) ARB_shader_texture_lod works perfectly well without those types provided that the builtin functions that reference them are not called, and (b) ARB_texture_rectangle is enabled by default in non-ES contexts anyway. I eliminated this unnecessary behavior in order to make the behavior of all extensions consistent. NOTE: This is a candidate for the 7.10 and 7.11 branches. Reviewed-by: Ian Romanick <ian.d.romanick@intel.com>
2011-06-24 15:34:04 -07:00
/**
* Enum representing the possible behaviors that can be specified in
* an #extension directive.
*/
enum ext_behavior {
extension_disable,
extension_enable,
extension_require,
extension_warn
};
/**
* Element type for _mesa_glsl_supported_extensions
*/
struct _mesa_glsl_extension {
/**
* Name of the extension when referred to in a GLSL extension
* statement
*/
const char *name;
/** True if this extension is available to desktop GL shaders */
bool avail_in_GL;
/** True if this extension is available to GLES shaders */
bool avail_in_ES;
/**
* Flag in the gl_extensions struct indicating whether this
* extension is supported by the driver, or
* &gl_extensions::dummy_true if supported by all drivers.
*
* Note: the type (GLboolean gl_extensions::*) is a "pointer to
* member" type, the type-safe alternative to the "offsetof" macro.
* In a nutshell:
*
* - foo bar::* p declares p to be an "offset" to a field of type
* foo that exists within struct bar
* - &bar::baz computes the "offset" of field baz within struct bar
* - x.*p accesses the field of x that exists at "offset" p
* - x->*p is equivalent to (*x).*p
*/
const GLboolean gl_extensions::* supported_flag;
/**
* Flag in the _mesa_glsl_parse_state struct that should be set
* when this extension is enabled.
*
* See note in _mesa_glsl_extension::supported_flag about "pointer
* to member" types.
*/
bool _mesa_glsl_parse_state::* enable_flag;
/**
* Flag in the _mesa_glsl_parse_state struct that should be set
* when the shader requests "warn" behavior for this extension.
*
* See note in _mesa_glsl_extension::supported_flag about "pointer
* to member" types.
*/
bool _mesa_glsl_parse_state::* warn_flag;
bool compatible_with_state(const _mesa_glsl_parse_state *state) const;
void set_flags(_mesa_glsl_parse_state *state, ext_behavior behavior) const;
};
glsl: Remove shader stage checking for extension handling. Certain extensions only add functionality to particular shader stages. (For example, ARB_draw_instanced only adds variables to the vertex shader stage.) Previously, we only allowed such extensions to be enabled in the shader stages where they're useful. However, I've never found any text which mandates that behavior; in my opinion, you should be able to turn on extensions in any shader stage, even if they have no effect. Fixes Piglit tests glslparsertest/glsl2/draw_buffers-05.vert and ARB_draw_instanced/preprocessor/feature-macro-enabled.frag. Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=29185 Signed-off-by: Kenneth Graunke <kenneth@whitecape.org>
2013-07-29 10:40:51 -07:00
#define EXT(NAME, GL, ES, SUPPORTED_FLAG) \
{ "GL_" #NAME, GL, ES, &gl_extensions::SUPPORTED_FLAG, \
&_mesa_glsl_parse_state::NAME##_enable, \
glsl: Rewrote _mesa_glsl_process_extension to use table-driven logic. Instead of using a chain of manually maintained if/else blocks to handle "#extension" directives, we now consult a table that specifies, for each extension, the circumstances under which it is available, and what flags in _mesa_glsl_parse_state need to be set in order to activate it. This makes it easier to add new GLSL extensions in the future, and fixes the following bugs: - Previously, _mesa_glsl_process_extension would sometimes set the "_enable" and "_warn" flags for an extension before checking whether the extension was supported by the driver; as a result, specifying "enable" behavior for an unsupported extension would sometimes cause front-end support for that extension to be switched on in spite of the fact that back-end support was not available, leading to strange failures, such as those in https://bugs.freedesktop.org/show_bug.cgi?id=38015. - "#extension all: warn" and "#extension all: disable" had no effect. Notes: - All extensions are currently marked as unavailable in geometry shaders. This should not have any adverse effects since geometry shaders aren't supported yet. When we return to working on geometry shader support, we'll need to update the table for those extensions that are available in geometry shaders. - Previous to this commit, if a shader mentioned ARB_shader_texture_lod, extension ARB_texture_rectangle would be automatically turned on in order to ensure that the types sampler2DRect and sampler2DRectShadow would be defined. This was unnecessary, because (a) ARB_shader_texture_lod works perfectly well without those types provided that the builtin functions that reference them are not called, and (b) ARB_texture_rectangle is enabled by default in non-ES contexts anyway. I eliminated this unnecessary behavior in order to make the behavior of all extensions consistent. NOTE: This is a candidate for the 7.10 and 7.11 branches. Reviewed-by: Ian Romanick <ian.d.romanick@intel.com>
2011-06-24 15:34:04 -07:00
&_mesa_glsl_parse_state::NAME##_warn }
/**
* Table of extensions that can be enabled/disabled within a shader,
* and the conditions under which they are supported.
*/
static const _mesa_glsl_extension _mesa_glsl_supported_extensions[] = {
glsl: Remove shader stage checking for extension handling. Certain extensions only add functionality to particular shader stages. (For example, ARB_draw_instanced only adds variables to the vertex shader stage.) Previously, we only allowed such extensions to be enabled in the shader stages where they're useful. However, I've never found any text which mandates that behavior; in my opinion, you should be able to turn on extensions in any shader stage, even if they have no effect. Fixes Piglit tests glslparsertest/glsl2/draw_buffers-05.vert and ARB_draw_instanced/preprocessor/feature-macro-enabled.frag. Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=29185 Signed-off-by: Kenneth Graunke <kenneth@whitecape.org>
2013-07-29 10:40:51 -07:00
/* API availability */
/* name GL ES supported flag */
EXT(ARB_conservative_depth, true, false, ARB_conservative_depth),
EXT(ARB_draw_buffers, true, false, dummy_true),
EXT(ARB_draw_instanced, true, false, ARB_draw_instanced),
EXT(ARB_explicit_attrib_location, true, false, ARB_explicit_attrib_location),
EXT(ARB_fragment_coord_conventions, true, false, ARB_fragment_coord_conventions),
EXT(ARB_texture_rectangle, true, false, dummy_true),
EXT(EXT_texture_array, true, false, EXT_texture_array),
EXT(ARB_shader_texture_lod, true, false, ARB_shader_texture_lod),
EXT(ARB_shader_stencil_export, true, false, ARB_shader_stencil_export),
EXT(AMD_conservative_depth, true, false, ARB_conservative_depth),
EXT(AMD_shader_stencil_export, true, false, ARB_shader_stencil_export),
EXT(OES_texture_3D, false, true, EXT_texture3D),
EXT(OES_EGL_image_external, false, true, OES_EGL_image_external),
EXT(ARB_shader_bit_encoding, true, false, ARB_shader_bit_encoding),
EXT(ARB_uniform_buffer_object, true, false, ARB_uniform_buffer_object),
EXT(OES_standard_derivatives, false, true, OES_standard_derivatives),
EXT(ARB_texture_cube_map_array, true, false, ARB_texture_cube_map_array),
EXT(ARB_shading_language_packing, true, false, ARB_shading_language_packing),
EXT(ARB_shading_language_420pack, true, false, ARB_shading_language_420pack),
EXT(ARB_texture_multisample, true, false, ARB_texture_multisample),
glsl: add plumbing for GL_ARB_texture_query_levels Signed-off-by: Chris Forbes <chrisf@ijw.co.nz> Reviewed-by: Matt Turner <mattst88@gmail.com>
2013-09-26 19:37:30 +12:00
EXT(ARB_texture_query_levels, true, false, ARB_texture_query_levels),
glsl: Remove shader stage checking for extension handling. Certain extensions only add functionality to particular shader stages. (For example, ARB_draw_instanced only adds variables to the vertex shader stage.) Previously, we only allowed such extensions to be enabled in the shader stages where they're useful. However, I've never found any text which mandates that behavior; in my opinion, you should be able to turn on extensions in any shader stage, even if they have no effect. Fixes Piglit tests glslparsertest/glsl2/draw_buffers-05.vert and ARB_draw_instanced/preprocessor/feature-macro-enabled.frag. Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=29185 Signed-off-by: Kenneth Graunke <kenneth@whitecape.org>
2013-07-29 10:40:51 -07:00
EXT(ARB_texture_query_lod, true, false, ARB_texture_query_lod),
EXT(ARB_gpu_shader5, true, false, ARB_gpu_shader5),
EXT(AMD_vertex_shader_layer, true, false, AMD_vertex_shader_layer),
mesa: Rename MESA_shader_integer_mix to EXT_shader_integer_mix Everyone at the Khronos meeting was as surprised that GLSL didn't already support this as we were. Several vendors said they'd ship it, but there didn't seem to be enough interest to put in the effort to make it ARB or KHR. v2: Fix a couple typos and rename the spec file to EXT_shader_integer_mix.spec. Suggested by Roland. Signed-off-by: Ian Romanick <ian.d.romanick@intel.com> Reviewed-by: Matt Turner <mattst88@gmail.com> Reviewed-by: Roland Scheidegger <sroland@vmware.com>
2013-09-12 11:40:00 -05:00
EXT(EXT_shader_integer_mix, true, true, EXT_shader_integer_mix),
glsl: add texture gather changes V2 [Chris Forbes]: - Add new pattern, fixup parameter reading. V3: Rebase onto new builtins machinery Reviewed-by: Kenneth Graunke <kenneth@whitecape.org> Reviewed-by: Ian Romanick <ian.d.romanick@intel.com>
2012-12-24 00:57:37 +01:00
EXT(ARB_texture_gather, true, false, ARB_texture_gather),
glsl: Add extension enables for ARB_shader_atomic_counters. Reviewed-by: Paul Berry <stereotype441@gmail.com> Reviewed-by: Ian Romanick <ian.d.romanick@intel.com>
2013-10-07 18:55:18 -07:00
EXT(ARB_shader_atomic_counters, true, false, ARB_shader_atomic_counters),
mesa: Add infrastructure for GL_ARB_sample_shading This patch implements the common support code required for the GL_ARB_sample_shading extension. V2: Move GL_ARB_sample_shading to ARB extension list. Signed-off-by: Anuj Phogat <anuj.phogat@gmail.com> Reviewed-by: Ian Romanick <idr@freedesktop.org> Reviewed-by: Ken Graunke <kenneth@whitecape.org>
2013-08-30 12:34:36 -07:00
EXT(ARB_sample_shading, true, false, ARB_sample_shading),
glsl: Add extension tracking for AMD_shader_trinary_minmax Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
2014-01-03 00:09:48 +01:00
EXT(AMD_shader_trinary_minmax, true, false, dummy_false),
glsl: Rewrote _mesa_glsl_process_extension to use table-driven logic. Instead of using a chain of manually maintained if/else blocks to handle "#extension" directives, we now consult a table that specifies, for each extension, the circumstances under which it is available, and what flags in _mesa_glsl_parse_state need to be set in order to activate it. This makes it easier to add new GLSL extensions in the future, and fixes the following bugs: - Previously, _mesa_glsl_process_extension would sometimes set the "_enable" and "_warn" flags for an extension before checking whether the extension was supported by the driver; as a result, specifying "enable" behavior for an unsupported extension would sometimes cause front-end support for that extension to be switched on in spite of the fact that back-end support was not available, leading to strange failures, such as those in https://bugs.freedesktop.org/show_bug.cgi?id=38015. - "#extension all: warn" and "#extension all: disable" had no effect. Notes: - All extensions are currently marked as unavailable in geometry shaders. This should not have any adverse effects since geometry shaders aren't supported yet. When we return to working on geometry shader support, we'll need to update the table for those extensions that are available in geometry shaders. - Previous to this commit, if a shader mentioned ARB_shader_texture_lod, extension ARB_texture_rectangle would be automatically turned on in order to ensure that the types sampler2DRect and sampler2DRectShadow would be defined. This was unnecessary, because (a) ARB_shader_texture_lod works perfectly well without those types provided that the builtin functions that reference them are not called, and (b) ARB_texture_rectangle is enabled by default in non-ES contexts anyway. I eliminated this unnecessary behavior in order to make the behavior of all extensions consistent. NOTE: This is a candidate for the 7.10 and 7.11 branches. Reviewed-by: Ian Romanick <ian.d.romanick@intel.com>
2011-06-24 15:34:04 -07:00
};
#undef EXT
/**
* Determine whether a given extension is compatible with the target,
* API, and extension information in the current parser state.
*/
bool _mesa_glsl_extension::compatible_with_state(const _mesa_glsl_parse_state *
state) const
{
/* Check that this extension matches whether we are compiling
* for desktop GL or GLES.
*/
if (state->es_shader) {
if (!this->avail_in_ES) return false;
} else {
if (!this->avail_in_GL) return false;
}
/* Check that this extension is supported by the OpenGL
* implementation.
*
* Note: the ->* operator indexes into state->extensions by the
* offset this->supported_flag. See
* _mesa_glsl_extension::supported_flag for more info.
*/
return state->extensions->*(this->supported_flag);
}
/**
* Set the appropriate flags in the parser state to establish the
* given behavior for this extension.
*/
void _mesa_glsl_extension::set_flags(_mesa_glsl_parse_state *state,
ext_behavior behavior) const
{
/* Note: the ->* operator indexes into state by the
* offsets this->enable_flag and this->warn_flag. See
* _mesa_glsl_extension::supported_flag for more info.
*/
state->*(this->enable_flag) = (behavior != extension_disable);
state->*(this->warn_flag) = (behavior == extension_warn);
}
/**
* Find an extension by name in _mesa_glsl_supported_extensions. If
* the name is not found, return NULL.
*/
static const _mesa_glsl_extension *find_extension(const char *name)
{
for (unsigned i = 0; i < Elements(_mesa_glsl_supported_extensions); ++i) {
if (strcmp(name, _mesa_glsl_supported_extensions[i].name) == 0) {
return &_mesa_glsl_supported_extensions[i];
}
}
return NULL;
}
Begin processing #extension directive Nowhere near complete. It just parses correctly at this point.
2010-04-07 16:46:25 -07:00
bool
_mesa_glsl_process_extension(const char *name, YYLTYPE *name_locp,
glsl: Rewrote _mesa_glsl_process_extension to use table-driven logic. Instead of using a chain of manually maintained if/else blocks to handle "#extension" directives, we now consult a table that specifies, for each extension, the circumstances under which it is available, and what flags in _mesa_glsl_parse_state need to be set in order to activate it. This makes it easier to add new GLSL extensions in the future, and fixes the following bugs: - Previously, _mesa_glsl_process_extension would sometimes set the "_enable" and "_warn" flags for an extension before checking whether the extension was supported by the driver; as a result, specifying "enable" behavior for an unsupported extension would sometimes cause front-end support for that extension to be switched on in spite of the fact that back-end support was not available, leading to strange failures, such as those in https://bugs.freedesktop.org/show_bug.cgi?id=38015. - "#extension all: warn" and "#extension all: disable" had no effect. Notes: - All extensions are currently marked as unavailable in geometry shaders. This should not have any adverse effects since geometry shaders aren't supported yet. When we return to working on geometry shader support, we'll need to update the table for those extensions that are available in geometry shaders. - Previous to this commit, if a shader mentioned ARB_shader_texture_lod, extension ARB_texture_rectangle would be automatically turned on in order to ensure that the types sampler2DRect and sampler2DRectShadow would be defined. This was unnecessary, because (a) ARB_shader_texture_lod works perfectly well without those types provided that the builtin functions that reference them are not called, and (b) ARB_texture_rectangle is enabled by default in non-ES contexts anyway. I eliminated this unnecessary behavior in order to make the behavior of all extensions consistent. NOTE: This is a candidate for the 7.10 and 7.11 branches. Reviewed-by: Ian Romanick <ian.d.romanick@intel.com>
2011-06-24 15:34:04 -07:00
const char *behavior_string, YYLTYPE *behavior_locp,
Begin processing #extension directive Nowhere near complete. It just parses correctly at this point.
2010-04-07 16:46:25 -07:00
_mesa_glsl_parse_state *state)
{
glsl: Rewrote _mesa_glsl_process_extension to use table-driven logic. Instead of using a chain of manually maintained if/else blocks to handle "#extension" directives, we now consult a table that specifies, for each extension, the circumstances under which it is available, and what flags in _mesa_glsl_parse_state need to be set in order to activate it. This makes it easier to add new GLSL extensions in the future, and fixes the following bugs: - Previously, _mesa_glsl_process_extension would sometimes set the "_enable" and "_warn" flags for an extension before checking whether the extension was supported by the driver; as a result, specifying "enable" behavior for an unsupported extension would sometimes cause front-end support for that extension to be switched on in spite of the fact that back-end support was not available, leading to strange failures, such as those in https://bugs.freedesktop.org/show_bug.cgi?id=38015. - "#extension all: warn" and "#extension all: disable" had no effect. Notes: - All extensions are currently marked as unavailable in geometry shaders. This should not have any adverse effects since geometry shaders aren't supported yet. When we return to working on geometry shader support, we'll need to update the table for those extensions that are available in geometry shaders. - Previous to this commit, if a shader mentioned ARB_shader_texture_lod, extension ARB_texture_rectangle would be automatically turned on in order to ensure that the types sampler2DRect and sampler2DRectShadow would be defined. This was unnecessary, because (a) ARB_shader_texture_lod works perfectly well without those types provided that the builtin functions that reference them are not called, and (b) ARB_texture_rectangle is enabled by default in non-ES contexts anyway. I eliminated this unnecessary behavior in order to make the behavior of all extensions consistent. NOTE: This is a candidate for the 7.10 and 7.11 branches. Reviewed-by: Ian Romanick <ian.d.romanick@intel.com>
2011-06-24 15:34:04 -07:00
ext_behavior behavior;
if (strcmp(behavior_string, "warn") == 0) {
behavior = extension_warn;
} else if (strcmp(behavior_string, "require") == 0) {
behavior = extension_require;
} else if (strcmp(behavior_string, "enable") == 0) {
behavior = extension_enable;
} else if (strcmp(behavior_string, "disable") == 0) {
behavior = extension_disable;
Begin processing #extension directive Nowhere near complete. It just parses correctly at this point.
2010-04-07 16:46:25 -07:00
} else {
_mesa_glsl_error(behavior_locp, state,
glsl: Be consistent about '\n', '.', and capitalization in errors/warnings. The majority of calls to _mesa_glsl_error(), _mesa_glsl_warning(), and _mesa_glsl_parse_state::check_version() use a message that begins with a lower case letter and ends without a period. This patch makes all messages follow that convention. Also, error/warning messages shouldn't end in '\n', since _mesa_glsl_msg() automatically adds '\n' at the end of the message. Reviewed-by: Matt Turner <mattst88@gmail.com>
2013-07-25 19:56:43 -07:00
"unknown extension behavior `%s'",
glsl: Rewrote _mesa_glsl_process_extension to use table-driven logic. Instead of using a chain of manually maintained if/else blocks to handle "#extension" directives, we now consult a table that specifies, for each extension, the circumstances under which it is available, and what flags in _mesa_glsl_parse_state need to be set in order to activate it. This makes it easier to add new GLSL extensions in the future, and fixes the following bugs: - Previously, _mesa_glsl_process_extension would sometimes set the "_enable" and "_warn" flags for an extension before checking whether the extension was supported by the driver; as a result, specifying "enable" behavior for an unsupported extension would sometimes cause front-end support for that extension to be switched on in spite of the fact that back-end support was not available, leading to strange failures, such as those in https://bugs.freedesktop.org/show_bug.cgi?id=38015. - "#extension all: warn" and "#extension all: disable" had no effect. Notes: - All extensions are currently marked as unavailable in geometry shaders. This should not have any adverse effects since geometry shaders aren't supported yet. When we return to working on geometry shader support, we'll need to update the table for those extensions that are available in geometry shaders. - Previous to this commit, if a shader mentioned ARB_shader_texture_lod, extension ARB_texture_rectangle would be automatically turned on in order to ensure that the types sampler2DRect and sampler2DRectShadow would be defined. This was unnecessary, because (a) ARB_shader_texture_lod works perfectly well without those types provided that the builtin functions that reference them are not called, and (b) ARB_texture_rectangle is enabled by default in non-ES contexts anyway. I eliminated this unnecessary behavior in order to make the behavior of all extensions consistent. NOTE: This is a candidate for the 7.10 and 7.11 branches. Reviewed-by: Ian Romanick <ian.d.romanick@intel.com>
2011-06-24 15:34:04 -07:00
behavior_string);
Begin processing #extension directive Nowhere near complete. It just parses correctly at this point.
2010-04-07 16:46:25 -07:00
return false;
}
if (strcmp(name, "all") == 0) {
glsl: Rewrote _mesa_glsl_process_extension to use table-driven logic. Instead of using a chain of manually maintained if/else blocks to handle "#extension" directives, we now consult a table that specifies, for each extension, the circumstances under which it is available, and what flags in _mesa_glsl_parse_state need to be set in order to activate it. This makes it easier to add new GLSL extensions in the future, and fixes the following bugs: - Previously, _mesa_glsl_process_extension would sometimes set the "_enable" and "_warn" flags for an extension before checking whether the extension was supported by the driver; as a result, specifying "enable" behavior for an unsupported extension would sometimes cause front-end support for that extension to be switched on in spite of the fact that back-end support was not available, leading to strange failures, such as those in https://bugs.freedesktop.org/show_bug.cgi?id=38015. - "#extension all: warn" and "#extension all: disable" had no effect. Notes: - All extensions are currently marked as unavailable in geometry shaders. This should not have any adverse effects since geometry shaders aren't supported yet. When we return to working on geometry shader support, we'll need to update the table for those extensions that are available in geometry shaders. - Previous to this commit, if a shader mentioned ARB_shader_texture_lod, extension ARB_texture_rectangle would be automatically turned on in order to ensure that the types sampler2DRect and sampler2DRectShadow would be defined. This was unnecessary, because (a) ARB_shader_texture_lod works perfectly well without those types provided that the builtin functions that reference them are not called, and (b) ARB_texture_rectangle is enabled by default in non-ES contexts anyway. I eliminated this unnecessary behavior in order to make the behavior of all extensions consistent. NOTE: This is a candidate for the 7.10 and 7.11 branches. Reviewed-by: Ian Romanick <ian.d.romanick@intel.com>
2011-06-24 15:34:04 -07:00
if ((behavior == extension_enable) || (behavior == extension_require)) {
glsl: Be consistent about '\n', '.', and capitalization in errors/warnings. The majority of calls to _mesa_glsl_error(), _mesa_glsl_warning(), and _mesa_glsl_parse_state::check_version() use a message that begins with a lower case letter and ends without a period. This patch makes all messages follow that convention. Also, error/warning messages shouldn't end in '\n', since _mesa_glsl_msg() automatically adds '\n' at the end of the message. Reviewed-by: Matt Turner <mattst88@gmail.com>
2013-07-25 19:56:43 -07:00
_mesa_glsl_error(name_locp, state, "cannot %s all extensions",
glsl: Rewrote _mesa_glsl_process_extension to use table-driven logic. Instead of using a chain of manually maintained if/else blocks to handle "#extension" directives, we now consult a table that specifies, for each extension, the circumstances under which it is available, and what flags in _mesa_glsl_parse_state need to be set in order to activate it. This makes it easier to add new GLSL extensions in the future, and fixes the following bugs: - Previously, _mesa_glsl_process_extension would sometimes set the "_enable" and "_warn" flags for an extension before checking whether the extension was supported by the driver; as a result, specifying "enable" behavior for an unsupported extension would sometimes cause front-end support for that extension to be switched on in spite of the fact that back-end support was not available, leading to strange failures, such as those in https://bugs.freedesktop.org/show_bug.cgi?id=38015. - "#extension all: warn" and "#extension all: disable" had no effect. Notes: - All extensions are currently marked as unavailable in geometry shaders. This should not have any adverse effects since geometry shaders aren't supported yet. When we return to working on geometry shader support, we'll need to update the table for those extensions that are available in geometry shaders. - Previous to this commit, if a shader mentioned ARB_shader_texture_lod, extension ARB_texture_rectangle would be automatically turned on in order to ensure that the types sampler2DRect and sampler2DRectShadow would be defined. This was unnecessary, because (a) ARB_shader_texture_lod works perfectly well without those types provided that the builtin functions that reference them are not called, and (b) ARB_texture_rectangle is enabled by default in non-ES contexts anyway. I eliminated this unnecessary behavior in order to make the behavior of all extensions consistent. NOTE: This is a candidate for the 7.10 and 7.11 branches. Reviewed-by: Ian Romanick <ian.d.romanick@intel.com>
2011-06-24 15:34:04 -07:00
(behavior == extension_enable)
Begin processing #extension directive Nowhere near complete. It just parses correctly at this point.
2010-04-07 16:46:25 -07:00
? "enable" : "require");
return false;
Add support for GL_ARB_draw_buffers extension
2010-04-07 16:59:46 -07:00
} else {
glsl: Rewrote _mesa_glsl_process_extension to use table-driven logic. Instead of using a chain of manually maintained if/else blocks to handle "#extension" directives, we now consult a table that specifies, for each extension, the circumstances under which it is available, and what flags in _mesa_glsl_parse_state need to be set in order to activate it. This makes it easier to add new GLSL extensions in the future, and fixes the following bugs: - Previously, _mesa_glsl_process_extension would sometimes set the "_enable" and "_warn" flags for an extension before checking whether the extension was supported by the driver; as a result, specifying "enable" behavior for an unsupported extension would sometimes cause front-end support for that extension to be switched on in spite of the fact that back-end support was not available, leading to strange failures, such as those in https://bugs.freedesktop.org/show_bug.cgi?id=38015. - "#extension all: warn" and "#extension all: disable" had no effect. Notes: - All extensions are currently marked as unavailable in geometry shaders. This should not have any adverse effects since geometry shaders aren't supported yet. When we return to working on geometry shader support, we'll need to update the table for those extensions that are available in geometry shaders. - Previous to this commit, if a shader mentioned ARB_shader_texture_lod, extension ARB_texture_rectangle would be automatically turned on in order to ensure that the types sampler2DRect and sampler2DRectShadow would be defined. This was unnecessary, because (a) ARB_shader_texture_lod works perfectly well without those types provided that the builtin functions that reference them are not called, and (b) ARB_texture_rectangle is enabled by default in non-ES contexts anyway. I eliminated this unnecessary behavior in order to make the behavior of all extensions consistent. NOTE: This is a candidate for the 7.10 and 7.11 branches. Reviewed-by: Ian Romanick <ian.d.romanick@intel.com>
2011-06-24 15:34:04 -07:00
for (unsigned i = 0;
i < Elements(_mesa_glsl_supported_extensions); ++i) {
const _mesa_glsl_extension *extension
= &_mesa_glsl_supported_extensions[i];
if (extension->compatible_with_state(state)) {
_mesa_glsl_supported_extensions[i].set_flags(state, behavior);
}
}
Add support for GL_ARB_draw_buffers extension
2010-04-07 16:59:46 -07:00
}
Begin processing #extension directive Nowhere near complete. It just parses correctly at this point.
2010-04-07 16:46:25 -07:00
} else {
glsl: Rewrote _mesa_glsl_process_extension to use table-driven logic. Instead of using a chain of manually maintained if/else blocks to handle "#extension" directives, we now consult a table that specifies, for each extension, the circumstances under which it is available, and what flags in _mesa_glsl_parse_state need to be set in order to activate it. This makes it easier to add new GLSL extensions in the future, and fixes the following bugs: - Previously, _mesa_glsl_process_extension would sometimes set the "_enable" and "_warn" flags for an extension before checking whether the extension was supported by the driver; as a result, specifying "enable" behavior for an unsupported extension would sometimes cause front-end support for that extension to be switched on in spite of the fact that back-end support was not available, leading to strange failures, such as those in https://bugs.freedesktop.org/show_bug.cgi?id=38015. - "#extension all: warn" and "#extension all: disable" had no effect. Notes: - All extensions are currently marked as unavailable in geometry shaders. This should not have any adverse effects since geometry shaders aren't supported yet. When we return to working on geometry shader support, we'll need to update the table for those extensions that are available in geometry shaders. - Previous to this commit, if a shader mentioned ARB_shader_texture_lod, extension ARB_texture_rectangle would be automatically turned on in order to ensure that the types sampler2DRect and sampler2DRectShadow would be defined. This was unnecessary, because (a) ARB_shader_texture_lod works perfectly well without those types provided that the builtin functions that reference them are not called, and (b) ARB_texture_rectangle is enabled by default in non-ES contexts anyway. I eliminated this unnecessary behavior in order to make the behavior of all extensions consistent. NOTE: This is a candidate for the 7.10 and 7.11 branches. Reviewed-by: Ian Romanick <ian.d.romanick@intel.com>
2011-06-24 15:34:04 -07:00
const _mesa_glsl_extension *extension = find_extension(name);
if (extension && extension->compatible_with_state(state)) {
extension->set_flags(state, behavior);
Emit a warning when an unknown extension is used with #extension
2010-04-07 14:50:36 -07:00
} else {
glsl: Rewrote _mesa_glsl_process_extension to use table-driven logic. Instead of using a chain of manually maintained if/else blocks to handle "#extension" directives, we now consult a table that specifies, for each extension, the circumstances under which it is available, and what flags in _mesa_glsl_parse_state need to be set in order to activate it. This makes it easier to add new GLSL extensions in the future, and fixes the following bugs: - Previously, _mesa_glsl_process_extension would sometimes set the "_enable" and "_warn" flags for an extension before checking whether the extension was supported by the driver; as a result, specifying "enable" behavior for an unsupported extension would sometimes cause front-end support for that extension to be switched on in spite of the fact that back-end support was not available, leading to strange failures, such as those in https://bugs.freedesktop.org/show_bug.cgi?id=38015. - "#extension all: warn" and "#extension all: disable" had no effect. Notes: - All extensions are currently marked as unavailable in geometry shaders. This should not have any adverse effects since geometry shaders aren't supported yet. When we return to working on geometry shader support, we'll need to update the table for those extensions that are available in geometry shaders. - Previous to this commit, if a shader mentioned ARB_shader_texture_lod, extension ARB_texture_rectangle would be automatically turned on in order to ensure that the types sampler2DRect and sampler2DRectShadow would be defined. This was unnecessary, because (a) ARB_shader_texture_lod works perfectly well without those types provided that the builtin functions that reference them are not called, and (b) ARB_texture_rectangle is enabled by default in non-ES contexts anyway. I eliminated this unnecessary behavior in order to make the behavior of all extensions consistent. NOTE: This is a candidate for the 7.10 and 7.11 branches. Reviewed-by: Ian Romanick <ian.d.romanick@intel.com>
2011-06-24 15:34:04 -07:00
static const char *const fmt = "extension `%s' unsupported in %s shader";
if (behavior == extension_require) {
_mesa_glsl_error(name_locp, state, fmt,
Rename overloads of _mesa_glsl_shader_target_name(). Previously, _mesa_glsl_shader_target_name() had an overload for GLenum and an overload for the gl_shader_type enum, each of which behaved differently. However, since GLenum is a synonym for unsigned int, and unsigned ints are often used in place of gl_shader_type (e.g. in loop indices), there was a big risk of calling the wrong overload by mistake. This patch gives the two overloads different names so that it's always clear which one we mean to call. Reviewed-by: Brian Paul <brianp@vmware.com>
2013-12-17 12:13:11 -08:00
name, _mesa_shader_type_to_string(state->target));
glsl: Rewrote _mesa_glsl_process_extension to use table-driven logic. Instead of using a chain of manually maintained if/else blocks to handle "#extension" directives, we now consult a table that specifies, for each extension, the circumstances under which it is available, and what flags in _mesa_glsl_parse_state need to be set in order to activate it. This makes it easier to add new GLSL extensions in the future, and fixes the following bugs: - Previously, _mesa_glsl_process_extension would sometimes set the "_enable" and "_warn" flags for an extension before checking whether the extension was supported by the driver; as a result, specifying "enable" behavior for an unsupported extension would sometimes cause front-end support for that extension to be switched on in spite of the fact that back-end support was not available, leading to strange failures, such as those in https://bugs.freedesktop.org/show_bug.cgi?id=38015. - "#extension all: warn" and "#extension all: disable" had no effect. Notes: - All extensions are currently marked as unavailable in geometry shaders. This should not have any adverse effects since geometry shaders aren't supported yet. When we return to working on geometry shader support, we'll need to update the table for those extensions that are available in geometry shaders. - Previous to this commit, if a shader mentioned ARB_shader_texture_lod, extension ARB_texture_rectangle would be automatically turned on in order to ensure that the types sampler2DRect and sampler2DRectShadow would be defined. This was unnecessary, because (a) ARB_shader_texture_lod works perfectly well without those types provided that the builtin functions that reference them are not called, and (b) ARB_texture_rectangle is enabled by default in non-ES contexts anyway. I eliminated this unnecessary behavior in order to make the behavior of all extensions consistent. NOTE: This is a candidate for the 7.10 and 7.11 branches. Reviewed-by: Ian Romanick <ian.d.romanick@intel.com>
2011-06-24 15:34:04 -07:00
return false;
} else {
_mesa_glsl_warning(name_locp, state, fmt,
Rename overloads of _mesa_glsl_shader_target_name(). Previously, _mesa_glsl_shader_target_name() had an overload for GLenum and an overload for the gl_shader_type enum, each of which behaved differently. However, since GLenum is a synonym for unsigned int, and unsigned ints are often used in place of gl_shader_type (e.g. in loop indices), there was a big risk of calling the wrong overload by mistake. This patch gives the two overloads different names so that it's always clear which one we mean to call. Reviewed-by: Brian Paul <brianp@vmware.com>
2013-12-17 12:13:11 -08:00
name, _mesa_shader_type_to_string(state->target));
glsl: Rewrote _mesa_glsl_process_extension to use table-driven logic. Instead of using a chain of manually maintained if/else blocks to handle "#extension" directives, we now consult a table that specifies, for each extension, the circumstances under which it is available, and what flags in _mesa_glsl_parse_state need to be set in order to activate it. This makes it easier to add new GLSL extensions in the future, and fixes the following bugs: - Previously, _mesa_glsl_process_extension would sometimes set the "_enable" and "_warn" flags for an extension before checking whether the extension was supported by the driver; as a result, specifying "enable" behavior for an unsupported extension would sometimes cause front-end support for that extension to be switched on in spite of the fact that back-end support was not available, leading to strange failures, such as those in https://bugs.freedesktop.org/show_bug.cgi?id=38015. - "#extension all: warn" and "#extension all: disable" had no effect. Notes: - All extensions are currently marked as unavailable in geometry shaders. This should not have any adverse effects since geometry shaders aren't supported yet. When we return to working on geometry shader support, we'll need to update the table for those extensions that are available in geometry shaders. - Previous to this commit, if a shader mentioned ARB_shader_texture_lod, extension ARB_texture_rectangle would be automatically turned on in order to ensure that the types sampler2DRect and sampler2DRectShadow would be defined. This was unnecessary, because (a) ARB_shader_texture_lod works perfectly well without those types provided that the builtin functions that reference them are not called, and (b) ARB_texture_rectangle is enabled by default in non-ES contexts anyway. I eliminated this unnecessary behavior in order to make the behavior of all extensions consistent. NOTE: This is a candidate for the 7.10 and 7.11 branches. Reviewed-by: Ian Romanick <ian.d.romanick@intel.com>
2011-06-24 15:34:04 -07:00
}
Begin processing #extension directive Nowhere near complete. It just parses correctly at this point.
2010-04-07 16:46:25 -07:00
}
}
return true;
}
glsl: Add support for C-style initializers. Required by GL_ARB_shading_language_420pack. Parts based on work done by Todd Previte and Ken Graunke, implementing basic support for C-style initializers of arrays. Reviewed-by: Ian Romanick <ian.d.romanick@intel.com>
2013-06-29 19:29:16 -07:00
/**
* Returns the name of the type of a column of a matrix. E.g.,
*
* "mat3" -> "vec3"
* "mat4x2" -> "vec2"
*/
static const char *
_mesa_ast_get_matrix_column_type_name(const char *matrix_type_name)
{
static const char *vec_name[] = { "vec2", "vec3", "vec4" };
/* The number of elements in a row of a matrix is specified by the last
* character of the matrix type name.
*/
long rows = strtol(matrix_type_name + strlen(matrix_type_name) - 1,
NULL, 10);
return vec_name[rows - 2];
}
/**
* Recurses through <type> and <expr> if <expr> is an aggregate initializer
* and sets <expr>'s <constructor_type> field to <type>. Gives later functions
* (process_array_constructor, et al) sufficient information to do type
* checking.
*
* Operates on assignments involving an aggregate initializer. E.g.,
*
* vec4 pos = {1.0, -1.0, 0.0, 1.0};
*
* or more ridiculously,
*
* struct S {
* vec4 v[2];
* };
*
* struct {
* S a[2], b;
* int c;
* } aggregate = {
* {
* {
* {
* {1.0, 2.0, 3.0, 4.0}, // a[0].v[0]
* {5.0, 6.0, 7.0, 8.0} // a[0].v[1]
* } // a[0].v
* }, // a[0]
* {
* {
* {1.0, 2.0, 3.0, 4.0}, // a[1].v[0]
* {5.0, 6.0, 7.0, 8.0} // a[1].v[1]
* } // a[1].v
* } // a[1]
* }, // a
* {
* {
* {1.0, 2.0, 3.0, 4.0}, // b.v[0]
* {5.0, 6.0, 7.0, 8.0} // b.v[1]
* } // b.v
* }, // b
* 4 // c
* };
*
* This pass is necessary because the right-hand side of <type> e = { ... }
* doesn't contain sufficient information to determine if the types match.
*/
void
_mesa_ast_set_aggregate_type(const ast_type_specifier *type,
ast_expression *expr,
_mesa_glsl_parse_state *state)
{
void *ctx = state;
ast_aggregate_initializer *ai = (ast_aggregate_initializer *)expr;
ai->constructor_type = (ast_type_specifier *)type;
bool is_declaration = ai->constructor_type->structure != NULL;
if (!is_declaration) {
/* Look up <type> name in the symbol table to see if it's a struct. */
const ast_type_specifier *struct_type =
state->symbols->get_type_ast(type->type_name);
ai->constructor_type->structure =
struct_type ? new(ctx) ast_struct_specifier(*struct_type->structure)
: NULL;
}
/* If the aggregate is an array, recursively set its elements' types. */
if (type->is_array) {
/* We want to set the element type which is not an array itself, so make
* a copy of the array type and set its is_array field to false.
*
* E.g., if <type> if struct S[2] we want to set each element's type to
* struct S.
*
* FINISHME: Update when ARB_array_of_arrays is supported.
*/
const ast_type_specifier *non_array_type =
new(ctx) ast_type_specifier(type, false, NULL);
for (exec_node *expr_node = ai->expressions.head;
!expr_node->is_tail_sentinel();
expr_node = expr_node->next) {
ast_expression *expr = exec_node_data(ast_expression, expr_node,
link);
if (expr->oper == ast_aggregate)
_mesa_ast_set_aggregate_type(non_array_type, expr, state);
}
/* If the aggregate is a struct, recursively set its fields' types. */
} else if (ai->constructor_type->structure) {
ai->constructor_type->structure->is_declaration = is_declaration;
exec_node *expr_node = ai->expressions.head;
/* Iterate through the struct's fields' declarations. E.g., iterate from
* "float a, b" to "int c" in the struct below.
*
* struct {
* float a, b;
* int c;
* } s;
*/
for (exec_node *decl_list_node =
ai->constructor_type->structure->declarations.head;
!decl_list_node->is_tail_sentinel();
decl_list_node = decl_list_node->next) {
ast_declarator_list *decl_list = exec_node_data(ast_declarator_list,
decl_list_node, link);
for (exec_node *decl_node = decl_list->declarations.head;
!decl_node->is_tail_sentinel() && !expr_node->is_tail_sentinel();
decl_node = decl_node->next, expr_node = expr_node->next) {
ast_declaration *decl = exec_node_data(ast_declaration, decl_node,
link);
ast_expression *expr = exec_node_data(ast_expression, expr_node,
link);
bool is_array = decl_list->type->specifier->is_array;
ast_expression *array_size = decl_list->type->specifier->array_size;
/* Recognize variable declarations with the bracketed size attached
* to the type rather than the variable name as arrays. E.g.,
*
* float a[2];
* float[2] b;
*
* are both arrays, but <a>'s array_size is decl->array_size, while
* <b>'s array_size is decl_list->type->specifier->array_size.
*/
if (!is_array) {
/* FINISHME: Update when ARB_array_of_arrays is supported. */
is_array = decl->is_array;
array_size = decl->array_size;
}
/* Declaration shadows the <type> parameter. */
ast_type_specifier *type =
new(ctx) ast_type_specifier(decl_list->type->specifier,
is_array, array_size);
if (expr->oper == ast_aggregate)
_mesa_ast_set_aggregate_type(type, expr, state);
}
}
} else {
/* If the aggregate is a matrix, set its columns' types. */
const char *name;
const glsl_type *const constructor_type =
ai->constructor_type->glsl_type(&name, state);
if (constructor_type->is_matrix()) {
for (exec_node *expr_node = ai->expressions.head;
!expr_node->is_tail_sentinel();
expr_node = expr_node->next) {
ast_expression *expr = exec_node_data(ast_expression, expr_node,
link);
/* Declaration shadows the <type> parameter. */
ast_type_specifier *type = new(ctx)
ast_type_specifier(_mesa_ast_get_matrix_column_type_name(name));
if (expr->oper == ast_aggregate)
_mesa_ast_set_aggregate_type(type, expr, state);
}
}
}
}
Initial commit. lol
2010-02-22 13:19:34 -08:00
void
_mesa_ast_type_qualifier_print(const struct ast_type_qualifier *q)
{
glsl: Wrap ast_type_qualifier contents in a struct in a union This will ease adding non-bit fields in the near future.
2010-10-05 16:38:47 -07:00
if (q->flags.q.constant)
Initial commit. lol
2010-02-22 13:19:34 -08:00
printf("const ");
glsl: Wrap ast_type_qualifier contents in a struct in a union This will ease adding non-bit fields in the near future.
2010-10-05 16:38:47 -07:00
if (q->flags.q.invariant)
Initial commit. lol
2010-02-22 13:19:34 -08:00
printf("invariant ");
glsl: Wrap ast_type_qualifier contents in a struct in a union This will ease adding non-bit fields in the near future.
2010-10-05 16:38:47 -07:00
if (q->flags.q.attribute)
Initial commit. lol
2010-02-22 13:19:34 -08:00
printf("attribute ");
glsl: Wrap ast_type_qualifier contents in a struct in a union This will ease adding non-bit fields in the near future.
2010-10-05 16:38:47 -07:00
if (q->flags.q.varying)
Initial commit. lol
2010-02-22 13:19:34 -08:00
printf("varying ");
glsl: Wrap ast_type_qualifier contents in a struct in a union This will ease adding non-bit fields in the near future.
2010-10-05 16:38:47 -07:00
if (q->flags.q.in && q->flags.q.out)
Initial commit. lol
2010-02-22 13:19:34 -08:00
printf("inout ");
else {
glsl: Wrap ast_type_qualifier contents in a struct in a union This will ease adding non-bit fields in the near future.
2010-10-05 16:38:47 -07:00
if (q->flags.q.in)
Initial commit. lol
2010-02-22 13:19:34 -08:00
printf("in ");
glsl: Wrap ast_type_qualifier contents in a struct in a union This will ease adding non-bit fields in the near future.
2010-10-05 16:38:47 -07:00
if (q->flags.q.out)
Initial commit. lol
2010-02-22 13:19:34 -08:00
printf("out ");
}
glsl: Wrap ast_type_qualifier contents in a struct in a union This will ease adding non-bit fields in the near future.
2010-10-05 16:38:47 -07:00
if (q->flags.q.centroid)
Initial commit. lol
2010-02-22 13:19:34 -08:00
printf("centroid ");
glsl: Add frontend support for `sample` auxiliary storage qualifier Signed-off-by: Chris Forbes <chrisf@ijw.co.nz> Reviewed-by: Francisco Jerez <currojerez@riseup.net>
2013-11-29 21:21:56 +13:00
if (q->flags.q.sample)
printf("sample ");
glsl: Wrap ast_type_qualifier contents in a struct in a union This will ease adding non-bit fields in the near future.
2010-10-05 16:38:47 -07:00
if (q->flags.q.uniform)
Initial commit. lol
2010-02-22 13:19:34 -08:00
printf("uniform ");
glsl: Wrap ast_type_qualifier contents in a struct in a union This will ease adding non-bit fields in the near future.
2010-10-05 16:38:47 -07:00
if (q->flags.q.smooth)
Initial commit. lol
2010-02-22 13:19:34 -08:00
printf("smooth ");
glsl: Wrap ast_type_qualifier contents in a struct in a union This will ease adding non-bit fields in the near future.
2010-10-05 16:38:47 -07:00
if (q->flags.q.flat)
Initial commit. lol
2010-02-22 13:19:34 -08:00
printf("flat ");
glsl: Wrap ast_type_qualifier contents in a struct in a union This will ease adding non-bit fields in the near future.
2010-10-05 16:38:47 -07:00
if (q->flags.q.noperspective)
Initial commit. lol
2010-02-22 13:19:34 -08:00
printf("noperspective ");
}
void
ast_node::print(void) const
{
Remove ast_node::type It isn't a type (is was enum specifying the kind of node), it was unused, and it was easily confused with actual type fields. Kill with fire.
2010-04-02 11:03:47 -07:00
printf("unhandled node ");
Initial commit. lol
2010-02-22 13:19:34 -08:00
}
ast_node::ast_node(void)
{
ast: Initialize location data in constructor of all ast_node objects. This prevents using uninitialized data in _msea_glsl_error in some cases, (including at least 6 piglit tests). Thanks to valgrind for pointing out the problem!
2010-07-29 16:39:36 -07:00
this->location.source = 0;
this->location.line = 0;
this->location.column = 0;
Initial commit. lol
2010-02-22 13:19:34 -08:00
}
static void
ast_opt_array_size_print(bool is_array, const ast_expression *array_size)
{
if (is_array) {
printf("[ ");
if (array_size)
array_size->print();
printf("] ");
}
}
void
ast_compound_statement::print(void) const
{
printf("{\n");
Convert ast_node use of simple_node to exec_list and exec_node
2010-05-10 11:17:53 -07:00
foreach_list_const(n, &this->statements) {
ast_node *ast = exec_node_data(ast_node, n, link);
ast->print();
Initial commit. lol
2010-02-22 13:19:34 -08:00
}
printf("}\n");
}
ast_compound_statement::ast_compound_statement(int new_scope,
ast_node *statements)
{
this->new_scope = new_scope;
if (statements != NULL) {
Convert ast_node use of simple_node to exec_list and exec_node
2010-05-10 11:17:53 -07:00
this->statements.push_degenerate_list_at_head(&statements->link);
Initial commit. lol
2010-02-22 13:19:34 -08:00
}
}
void
ast_expression::print(void) const
{
switch (oper) {
case ast_assign:
case ast_mul_assign:
case ast_div_assign:
case ast_mod_assign:
case ast_add_assign:
case ast_sub_assign:
case ast_ls_assign:
case ast_rs_assign:
case ast_and_assign:
case ast_xor_assign:
case ast_or_assign:
subexpressions[0]->print();
Add ast_expression_bin subclass of ast_expression The ast_expression_bin subclass is used for all binary expressions such as addition, subtraction, and comparisons. Several other subclasses are soon to follow.
2010-02-22 19:10:25 -08:00
printf("%s ", operator_string(oper));
Initial commit. lol
2010-02-22 13:19:34 -08:00
subexpressions[1]->print();
break;
case ast_field_selection:
subexpressions[0]->print();
printf(". %s ", primary_expression.identifier);
break;
case ast_plus:
case ast_neg:
case ast_bit_not:
case ast_logic_not:
case ast_pre_inc:
case ast_pre_dec:
Add ast_expression_bin subclass of ast_expression The ast_expression_bin subclass is used for all binary expressions such as addition, subtraction, and comparisons. Several other subclasses are soon to follow.
2010-02-22 19:10:25 -08:00
printf("%s ", operator_string(oper));
Initial commit. lol
2010-02-22 13:19:34 -08:00
subexpressions[0]->print();
break;
case ast_post_inc:
case ast_post_dec:
subexpressions[0]->print();
Add ast_expression_bin subclass of ast_expression The ast_expression_bin subclass is used for all binary expressions such as addition, subtraction, and comparisons. Several other subclasses are soon to follow.
2010-02-22 19:10:25 -08:00
printf("%s ", operator_string(oper));
Initial commit. lol
2010-02-22 13:19:34 -08:00
break;
case ast_conditional:
subexpressions[0]->print();
printf("? ");
subexpressions[1]->print();
printf(": ");
AST dump: fixed printing of conditionals. ast_expression::print() had an incorrect index into the subexpressions array, so (a ? b : c) was being incorrectly rendered as (a ? b : b). Signed-off-by: Brian Paul <brianp@vmware.com>
2011-06-03 10:02:32 -07:00
subexpressions[2]->print();
Initial commit. lol
2010-02-22 13:19:34 -08:00
break;
case ast_array_index:
subexpressions[0]->print();
printf("[ ");
subexpressions[1]->print();
printf("] ");
break;
case ast_function_call: {
subexpressions[0]->print();
printf("( ");
Convert ast_node use of simple_node to exec_list and exec_node
2010-05-10 11:17:53 -07:00
foreach_list_const (n, &this->expressions) {
Fix function call parameter printer to omit extraneous leading comma The output of all test cases was verified to be the same using diff.
2010-05-14 16:06:41 -07:00
if (n != this->expressions.get_head())
printf(", ");
Convert ast_node use of simple_node to exec_list and exec_node
2010-05-10 11:17:53 -07:00
ast_node *ast = exec_node_data(ast_node, n, link);
ast->print();
Initial commit. lol
2010-02-22 13:19:34 -08:00
}
printf(") ");
break;
}
case ast_identifier:
printf("%s ", primary_expression.identifier);
break;
case ast_int_constant:
printf("%d ", primary_expression.int_constant);
break;
case ast_uint_constant:
printf("%u ", primary_expression.uint_constant);
break;
case ast_float_constant:
printf("%f ", primary_expression.float_constant);
break;
case ast_bool_constant:
printf("%s ",
primary_expression.bool_constant
? "true" : "false");
break;
case ast_sequence: {
printf("( ");
Convert ast_node use of simple_node to exec_list and exec_node
2010-05-10 11:17:53 -07:00
foreach_list_const(n, & this->expressions) {
if (n != this->expressions.get_head())
Initial commit. lol
2010-02-22 13:19:34 -08:00
printf(", ");
Convert ast_node use of simple_node to exec_list and exec_node
2010-05-10 11:17:53 -07:00
ast_node *ast = exec_node_data(ast_node, n, link);
ast->print();
Initial commit. lol
2010-02-22 13:19:34 -08:00
}
printf(") ");
break;
}
Add ast_expression_bin subclass of ast_expression The ast_expression_bin subclass is used for all binary expressions such as addition, subtraction, and comparisons. Several other subclasses are soon to follow.
2010-02-22 19:10:25 -08:00
glsl: Add infrastructure for aggregate initializers. Reviewed-by: Ian Romanick <ian.d.romanick@intel.com>
2013-06-29 19:27:50 -07:00
case ast_aggregate: {
printf("{ ");
foreach_list_const(n, & this->expressions) {
if (n != this->expressions.get_head())
printf(", ");
ast_node *ast = exec_node_data(ast_node, n, link);
ast->print();
}
printf("} ");
break;
}
Add ast_expression_bin subclass of ast_expression The ast_expression_bin subclass is used for all binary expressions such as addition, subtraction, and comparisons. Several other subclasses are soon to follow.
2010-02-22 19:10:25 -08:00
default:
assert(0);
break;
Initial commit. lol
2010-02-22 13:19:34 -08:00
}
}
ast_expression::ast_expression(int oper,
ast_expression *ex0,
ast_expression *ex1,
glsl: Switch ast_node to the non-zeroing allocator. All member variables of ast_node are already being initialized from its constructor, but some of its derived classes were leaving members uninitialized -- Fix them. Using rzalloc makes it more likely that we will start relying on the allocator to zero out all memory if the class is ever extended with new member variables. That's bad because it ties objects to some specific allocation scheme, and gives unpredictable results when an object is created with a different allocator -- Stack allocation, array allocation, or aggregation inside a different object are some of the useful possibilities that come to my mind. v2: Use NULL initialization instead of default construction for pointers. Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
2013-09-20 15:36:38 -07:00
ast_expression *ex2) :
primary_expression()
Initial commit. lol
2010-02-22 13:19:34 -08:00
{
this->oper = ast_operators(oper);
this->subexpressions[0] = ex0;
this->subexpressions[1] = ex1;
this->subexpressions[2] = ex2;
glsl: Track descriptions of some expressions that can't be l-values Signed-off-by: Ian Romanick <ian.d.romanick@intel.com> Reviewed-by: Paul Berry <stereotype441@gmail.com>
2011-12-23 09:56:03 -08:00
this->non_lvalue_description = NULL;
Initial commit. lol
2010-02-22 13:19:34 -08:00
}
void
ast_expression_statement::print(void) const
{
if (expression)
expression->print();
printf("; ");
}
ast_expression_statement::ast_expression_statement(ast_expression *ex) :
expression(ex)
{
/* empty */
}
void
ast_function::print(void) const
{
return_type->print();
printf(" %s (", identifier);
Convert ast_node use of simple_node to exec_list and exec_node
2010-05-10 11:17:53 -07:00
foreach_list_const(n, & this->parameters) {
ast_node *ast = exec_node_data(ast_node, n, link);
ast->print();
Initial commit. lol
2010-02-22 13:19:34 -08:00
}
printf(")");
}
ast_function::ast_function(void)
glsl: Initialize ast_function member variables. Fixes "Uninitialized pointer field" defect reported by Coverity. Signed-off-by: Vinson Lee <vlee@freedesktop.org>
2013-02-10 01:38:53 +01:00
: return_type(NULL), identifier(NULL), is_definition(false),
signature(NULL)
Initial commit. lol
2010-02-22 13:19:34 -08:00
{
Convert ast_node use of simple_node to exec_list and exec_node
2010-05-10 11:17:53 -07:00
/* empty */
Initial commit. lol
2010-02-22 13:19:34 -08:00
}
void
ast_fully_specified_type::print(void) const
{
_mesa_ast_type_qualifier_print(& qualifier);
specifier->print();
}
void
ast_parameter_declarator::print(void) const
{
type->print();
if (identifier)
printf("%s ", identifier);
ast_opt_array_size_print(is_array, array_size);
}
void
ast_function_definition::print(void) const
{
prototype->print();
body->print();
}
void
ast_declaration::print(void) const
{
printf("%s ", identifier);
ast_opt_array_size_print(is_array, array_size);
if (initializer) {
printf("= ");
initializer->print();
}
}
glsl: Change type of is_array to bool. Reviewed-by: Ian Romanick <ian.d.romainck@intel.com>
2013-06-10 15:59:55 -07:00
ast_declaration::ast_declaration(const char *identifier, bool is_array,
Initial commit. lol
2010-02-22 13:19:34 -08:00
ast_expression *array_size,
ast_expression *initializer)
{
this->identifier = identifier;
this->is_array = is_array;
this->array_size = array_size;
this->initializer = initializer;
}
void
ast_declarator_list::print(void) const
{
assert(type || invariant);
if (type)
type->print();
else
printf("invariant ");
Convert ast_node use of simple_node to exec_list and exec_node
2010-05-10 11:17:53 -07:00
foreach_list_const (ptr, & this->declarations) {
if (ptr != this->declarations.get_head())
Initial commit. lol
2010-02-22 13:19:34 -08:00
printf(", ");
Convert ast_node use of simple_node to exec_list and exec_node
2010-05-10 11:17:53 -07:00
ast_node *ast = exec_node_data(ast_node, ptr, link);
ast->print();
Initial commit. lol
2010-02-22 13:19:34 -08:00
}
printf("; ");
}
ast_declarator_list::ast_declarator_list(ast_fully_specified_type *type)
{
this->type = type;
glsl2: Initialize ast_declarator_list::invariant in constructor
2010-07-01 17:10:11 -07:00
this->invariant = false;
Initial commit. lol
2010-02-22 13:19:34 -08:00
}
void
ast_jump_statement::print(void) const
{
switch (mode) {
case ast_continue:
printf("continue; ");
break;
case ast_break:
printf("break; ");
break;
case ast_return:
printf("return ");
if (opt_return_value)
opt_return_value->print();
printf("; ");
break;
case ast_discard:
printf("discard; ");
break;
}
}
ast_jump_statement::ast_jump_statement(int mode, ast_expression *return_value)
glsl: Initialize ast_jump_statement::opt_return_value. opt_return_value was not initialized if mode != ast_return. Fixes "Uninitialized pointer field" defect reported by Coverity. Signed-off-by: Vinson Lee <vlee@freedesktop.org> Reviewed-by: Chad Versace <chad.versace@linux.intel.com>
2013-07-14 00:57:22 -07:00
: opt_return_value(NULL)
Initial commit. lol
2010-02-22 13:19:34 -08:00
{
this->mode = ast_jump_modes(mode);
if (mode == ast_return)
opt_return_value = return_value;
}
void
ast_selection_statement::print(void) const
{
printf("if ( ");
condition->print();
printf(") ");
then_statement->print();
if (else_statement) {
printf("else ");
else_statement->print();
}
}
ast_selection_statement::ast_selection_statement(ast_expression *condition,
ast_node *then_statement,
ast_node *else_statement)
{
this->condition = condition;
this->then_statement = then_statement;
this->else_statement = else_statement;
}
glsl: Reference data structure ctors in grammar We now tie the grammar to the ctors of the ASTs they reference. This requires that we actually have definitions of the ctors. In addition, we also need to define "print" and "hir" methods for the AST classes. The Print methods are pretty simple to flesh out. However, at this stage of the development, we simply stub out the "hir" methods and flesh them out later. Also, since actual class instances get returned by the productions in the grammar, we also need to designate the type of the productions that reference those instances. Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
2011-11-07 15:11:04 -08:00
void
ast_switch_statement::print(void) const
{
printf("switch ( ");
test_expression->print();
printf(") ");
body->print();
}
ast_switch_statement::ast_switch_statement(ast_expression *test_expression,
ast_node *body)
{
this->test_expression = test_expression;
this->body = body;
}
void
ast_switch_body::print(void) const
{
printf("{\n");
if (stmts != NULL) {
stmts->print();
}
printf("}\n");
}
ast_switch_body::ast_switch_body(ast_case_statement_list *stmts)
{
this->stmts = stmts;
}
void ast_case_label::print(void) const
{
if (test_value != NULL) {
printf("case ");
test_value->print();
printf(": ");
} else {
printf("default: ");
}
}
ast_case_label::ast_case_label(ast_expression *test_value)
{
this->test_value = test_value;
}
void ast_case_label_list::print(void) const
{
foreach_list_const(n, & this->labels) {
ast_node *ast = exec_node_data(ast_node, n, link);
ast->print();
}
printf("\n");
}
ast_case_label_list::ast_case_label_list(void)
{
}
void ast_case_statement::print(void) const
{
labels->print();
foreach_list_const(n, & this->stmts) {
ast_node *ast = exec_node_data(ast_node, n, link);
ast->print();
printf("\n");
}
}
ast_case_statement::ast_case_statement(ast_case_label_list *labels)
{
this->labels = labels;
}
void ast_case_statement_list::print(void) const
{
foreach_list_const(n, & this->cases) {
ast_node *ast = exec_node_data(ast_node, n, link);
ast->print();
}
}
ast_case_statement_list::ast_case_statement_list(void)
{
}
Initial commit. lol
2010-02-22 13:19:34 -08:00
void
ast_iteration_statement::print(void) const
{
switch (mode) {
case ast_for:
printf("for( ");
if (init_statement)
init_statement->print();
printf("; ");
if (condition)
condition->print();
printf("; ");
if (rest_expression)
rest_expression->print();
printf(") ");
body->print();
break;
case ast_while:
printf("while ( ");
if (condition)
condition->print();
printf(") ");
body->print();
break;
case ast_do_while:
printf("do ");
body->print();
printf("while ( ");
if (condition)
condition->print();
printf("); ");
break;
}
}
ast_iteration_statement::ast_iteration_statement(int mode,
ast_node *init,
ast_node *condition,
ast_expression *rest_expression,
ast_node *body)
{
this->mode = ast_iteration_modes(mode);
this->init_statement = init;
this->condition = condition;
this->rest_expression = rest_expression;
this->body = body;
}
void
ast_struct_specifier::print(void) const
{
printf("struct %s { ", name);
Convert ast_node use of simple_node to exec_list and exec_node
2010-05-10 11:17:53 -07:00
foreach_list_const(n, &this->declarations) {
ast_node *ast = exec_node_data(ast_node, n, link);
ast->print();
Initial commit. lol
2010-02-22 13:19:34 -08:00
}
printf("} ");
}
glsl: Use (const char *) in AST nodes rather than plain (char *). Nothing actually relied on them being mutable, and there was at least one cast which discarded const qualifiers. The next patch would have introduced many more. Casting away const qualifiers should be avoided if at all possible. Signed-off-by: Kenneth Graunke <kenneth@whitecape.org> Reviewed-by: Ian Romanick <ian.d.romanick@intel.com>
2012-03-29 23:17:31 -07:00
ast_struct_specifier::ast_struct_specifier(const char *identifier,
glsl: Don't hide the type of struct_declaration_list. I've been trying to derive from this for UBO support, and the slightly obfuscated types were putting me over the edge. Reviewed-by: Kenneth Graunke <kenneth@whitecape.org> Reviewed-by: Ian Romanick <ian.d.romanick@intel.com>
2012-04-26 10:16:52 -07:00
ast_declarator_list *declarator_list)
Initial commit. lol
2010-02-22 13:19:34 -08:00
{
glsl: Properly handle nested structure types. Fixes piglit test CorrectFull.frag.
2010-09-18 11:11:09 +02:00
if (identifier == NULL) {
static unsigned anon_count = 1;
Convert everything from the talloc API to the ralloc API.
2011-01-21 14:32:31 -08:00
identifier = ralloc_asprintf(this, "#anon_struct_%04x", anon_count);
glsl: Properly handle nested structure types. Fixes piglit test CorrectFull.frag.
2010-09-18 11:11:09 +02:00
anon_count++;
}
Initial commit. lol
2010-02-22 13:19:34 -08:00
name = identifier;
Convert ast_node use of simple_node to exec_list and exec_node
2010-05-10 11:17:53 -07:00
this->declarations.push_degenerate_list_at_head(&declarator_list->link);
glsl: Add an is_declaration field to ast_struct_specifier. Will be used in a later commit to differentiate between a structure type declaration and a variable declaration of a struct type. I.e., the difference between struct S { float x; }; (is_declaration = true) and S s; (is_declaration = false) Also note that is_declaration = true for struct S { float x; } s; Reviewed-by: Ian Romanick <ian.d.romanick@intel.com>
2013-06-26 15:53:12 -07:00
is_declaration = true;
Initial commit. lol
2010-02-22 13:19:34 -08:00
}
glsl2: Move the common optimization passes to a helper function. These are passes that we expect all codegen to be happy with. The other lowering passes for Mesa IR are moved to the Mesa IR generator.
2010-08-10 13:06:49 -07:00
glsl: Export the compiler's GS layout qualifiers to the gl_shader. Next step is to validate them at link time. v2 (Paul Berry <stereotype441@gmail.com>): Don't attempt to export the layout qualifiers in the event of a compile error, since some of them are set up by ast_to_hir(), and ast_to_hir() isn't guaranteed to have run in the event of a compile error. Reviewed-by: Kenneth Graunke <kenneth@whitecape.org> v3 (Paul Berry <stereotype441@gmail.com>): Use PRIM_UNKNOWN to represent "not set in this shader". Reviewed-by: Ian Romanick <ian.d.romanick@intel.com>
2013-06-12 17:21:44 -07:00
static void
set_shader_inout_layout(struct gl_shader *shader,
struct _mesa_glsl_parse_state *state)
{
if (shader->Type != GL_GEOMETRY_SHADER) {
/* Should have been prevented by the parser. */
assert(!state->gs_input_prim_type_specified);
assert(!state->out_qualifier->flags.i);
return;
}
shader->Geom.VerticesOut = 0;
if (state->out_qualifier->flags.q.max_vertices)
shader->Geom.VerticesOut = state->out_qualifier->max_vertices;
if (state->gs_input_prim_type_specified) {
shader->Geom.InputType = state->gs_input_prim_type;
} else {
shader->Geom.InputType = PRIM_UNKNOWN;
}
if (state->out_qualifier->flags.q.prim_type) {
shader->Geom.OutputType = state->out_qualifier->prim_type;
} else {
shader->Geom.OutputType = PRIM_UNKNOWN;
}
}
mesa: Move the common _mesa_glsl_compile_shader() code to glsl/. This code had no relation to ir_to_mesa.cpp, since it was also used by intel and state_tracker, and most of it was duplicated with the standalone compiler (which has periodically drifted from the Mesa copy). v2: Split from the ir_to_mesa to shaderapi.c changes. Acked-by: Paul Berry <stereotype441@gmail.com> (v1) Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
2013-06-12 15:49:43 -07:00
extern "C" {
void
_mesa_glsl_compile_shader(struct gl_context *ctx, struct gl_shader *shader,
bool dump_ast, bool dump_hir)
{
struct _mesa_glsl_parse_state *state =
new(shader) _mesa_glsl_parse_state(ctx, shader->Type, shader);
const char *source = shader->Source;
state->error = glcpp_preprocess(state, &source, &state->info_log,
&ctx->Extensions, ctx);
if (!state->error) {
_mesa_glsl_lexer_ctor(state, source);
_mesa_glsl_parse(state);
_mesa_glsl_lexer_dtor(state);
}
if (dump_ast) {
foreach_list_const(n, &state->translation_unit) {
ast_node *ast = exec_node_data(ast_node, n, link);
ast->print();
}
printf("\n\n");
}
ralloc_free(shader->ir);
shader->ir = new(shader) exec_list;
if (!state->error && !state->translation_unit.is_empty())
_mesa_ast_to_hir(shader->ir, state);
if (!state->error) {
validate_ir_tree(shader->ir);
/* Print out the unoptimized IR. */
if (dump_hir) {
_mesa_print_ir(shader->ir, state);
}
}
if (!state->error && !shader->ir->is_empty()) {
struct gl_shader_compiler_options *options =
&ctx->ShaderCompilerOptions[_mesa_shader_type_to_index(shader->Type)];
/* Do some optimization at compile time to reduce shader IR size
* and reduce later work if the same shader is linked multiple times
*/
while (do_common_optimization(shader->ir, false, false, 32, options))
;
validate_ir_tree(shader->ir);
}
if (shader->InfoLog)
ralloc_free(shader->InfoLog);
shader->symbols = state->symbols;
shader->CompileStatus = !state->error;
shader->InfoLog = state->info_log;
shader->Version = state->language_version;
shader->IsES = state->es_shader;
glsl: Simplify the built-in function linking code. Previously, we stored an array of up to 16 additional shaders to link, as well as a count of how many each shader actually needed. Since the built-in functions rewrite, all the built-ins are stored in a single shader. So all we need is a boolean indicating whether a shader needs to link against built-ins or not. During linking, we can avoid creating the temporary array if none of the shaders being linked need built-ins. Otherwise, it's simply a copy of the array that has one additional element. This is much simpler. This patch saves approximately 128 bytes of memory per gl_shader object. Signed-off-by: Kenneth Graunke <kenneth@whitecape.org> Reviewed-by: Ian Romanick <ian.d.romanick@intel.com>
2013-11-23 12:11:34 -08:00
shader->uses_builtin_functions = state->uses_builtin_functions;
mesa: Move the common _mesa_glsl_compile_shader() code to glsl/. This code had no relation to ir_to_mesa.cpp, since it was also used by intel and state_tracker, and most of it was duplicated with the standalone compiler (which has periodically drifted from the Mesa copy). v2: Split from the ir_to_mesa to shaderapi.c changes. Acked-by: Paul Berry <stereotype441@gmail.com> (v1) Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
2013-06-12 15:49:43 -07:00
if (shader->UniformBlocks)
ralloc_free(shader->UniformBlocks);
shader->NumUniformBlocks = state->num_uniform_blocks;
shader->UniformBlocks = state->uniform_blocks;
ralloc_steal(shader, shader->UniformBlocks);
glsl: Export the compiler's GS layout qualifiers to the gl_shader. Next step is to validate them at link time. v2 (Paul Berry <stereotype441@gmail.com>): Don't attempt to export the layout qualifiers in the event of a compile error, since some of them are set up by ast_to_hir(), and ast_to_hir() isn't guaranteed to have run in the event of a compile error. Reviewed-by: Kenneth Graunke <kenneth@whitecape.org> v3 (Paul Berry <stereotype441@gmail.com>): Use PRIM_UNKNOWN to represent "not set in this shader". Reviewed-by: Ian Romanick <ian.d.romanick@intel.com>
2013-06-12 17:21:44 -07:00
if (!state->error)
set_shader_inout_layout(shader, state);
mesa: Move the common _mesa_glsl_compile_shader() code to glsl/. This code had no relation to ir_to_mesa.cpp, since it was also used by intel and state_tracker, and most of it was duplicated with the standalone compiler (which has periodically drifted from the Mesa copy). v2: Split from the ir_to_mesa to shaderapi.c changes. Acked-by: Paul Berry <stereotype441@gmail.com> (v1) Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
2013-06-12 15:49:43 -07:00
/* Retain any live IR, but trash the rest. */
reparent_ir(shader->ir, shader->ir);
ralloc_free(state);
}
} /* extern "C" */
glsl: Add uniform_locations_assigned parameter to do_dead_code opt pass Setting this flag prevents declarations of uniforms from being removed from the IR. Since the IR is directly used by several API functions that query uniforms in shaders, uniform declarations cannot be removed after the locations have been set. However, it should still be safe to reorder the declarations (this is not tested). Signed-off-by: Ian Romanick <ian.d.romanick@intel.com> Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=41980 Tested-by: Brian Paul <brianp@vmware.com> Reviewed-by: Bryan Cain <bryancain3@gmail.com> Cc: Vinson Lee <vlee@vmware.com> Cc: José Fonseca <jfonseca@vmware.com> Reviewed-by: Kenneth Graunke <kenneth@whitecape.org> Reviewed-by: Yuanhan Liu <yuanhan.liu@linux.intel.com>
2011-10-21 11:17:39 -07:00
/**
* Do the set of common optimizations passes
*
* \param ir List of instructions to be optimized
* \param linked Is the shader linked? This enables
* optimizations passes that remove code at
* global scope and could cause linking to
* fail.
* \param uniform_locations_assigned Have locations already been assigned for
* uniforms? This prevents the declarations
* of unused uniforms from being removed.
* The setting of this flag only matters if
* \c linked is \c true.
* \param max_unroll_iterations Maximum number of loop iterations to be
glsl: fix incorrect comment about do_common_optimization
2013-01-31 23:29:53 +01:00
* unrolled. Setting to 0 disables loop
* unrolling.
glsl: Pass struct shader_compiler_options into do_common_optimization. do_common_optimization may need to make choices about whether to emit certain kinds of instructions. gl_context::ShaderCompilerOptions contains exactly that information, so it makes sense to pass it in. Rather than passing the whole array, pass the structure for the stage that's currently being worked on. Signed-off-by: Kenneth Graunke <kenneth@whitecape.org> Reviewed-by: Ian Romanick <ian.d.romanick@intel.com> Reviewed-by: Eric Anholt <eric@anholt.net>
2013-04-17 17:30:22 -07:00
* \param options The driver's preferred shader options.
glsl: Add uniform_locations_assigned parameter to do_dead_code opt pass Setting this flag prevents declarations of uniforms from being removed from the IR. Since the IR is directly used by several API functions that query uniforms in shaders, uniform declarations cannot be removed after the locations have been set. However, it should still be safe to reorder the declarations (this is not tested). Signed-off-by: Ian Romanick <ian.d.romanick@intel.com> Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=41980 Tested-by: Brian Paul <brianp@vmware.com> Reviewed-by: Bryan Cain <bryancain3@gmail.com> Cc: Vinson Lee <vlee@vmware.com> Cc: José Fonseca <jfonseca@vmware.com> Reviewed-by: Kenneth Graunke <kenneth@whitecape.org> Reviewed-by: Yuanhan Liu <yuanhan.liu@linux.intel.com>
2011-10-21 11:17:39 -07:00
*/
glsl2: Move the common optimization passes to a helper function. These are passes that we expect all codegen to be happy with. The other lowering passes for Mesa IR are moved to the Mesa IR generator.
2010-08-10 13:06:49 -07:00
bool
glsl: Add uniform_locations_assigned parameter to do_dead_code opt pass Setting this flag prevents declarations of uniforms from being removed from the IR. Since the IR is directly used by several API functions that query uniforms in shaders, uniform declarations cannot be removed after the locations have been set. However, it should still be safe to reorder the declarations (this is not tested). Signed-off-by: Ian Romanick <ian.d.romanick@intel.com> Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=41980 Tested-by: Brian Paul <brianp@vmware.com> Reviewed-by: Bryan Cain <bryancain3@gmail.com> Cc: Vinson Lee <vlee@vmware.com> Cc: José Fonseca <jfonseca@vmware.com> Reviewed-by: Kenneth Graunke <kenneth@whitecape.org> Reviewed-by: Yuanhan Liu <yuanhan.liu@linux.intel.com>
2011-10-21 11:17:39 -07:00
do_common_optimization(exec_list *ir, bool linked,
bool uniform_locations_assigned,
glsl: Pass struct shader_compiler_options into do_common_optimization. do_common_optimization may need to make choices about whether to emit certain kinds of instructions. gl_context::ShaderCompilerOptions contains exactly that information, so it makes sense to pass it in. Rather than passing the whole array, pass the structure for the stage that's currently being worked on. Signed-off-by: Kenneth Graunke <kenneth@whitecape.org> Reviewed-by: Ian Romanick <ian.d.romanick@intel.com> Reviewed-by: Eric Anholt <eric@anholt.net>
2013-04-17 17:30:22 -07:00
unsigned max_unroll_iterations,
const struct gl_shader_compiler_options *options)
glsl2: Move the common optimization passes to a helper function. These are passes that we expect all codegen to be happy with. The other lowering passes for Mesa IR are moved to the Mesa IR generator.
2010-08-10 13:06:49 -07:00
{
GLboolean progress = GL_FALSE;
glsl: Combine many instruction lowering passes into one. This should save on the overhead of tree-walking and provide a convenient place to add more instruction lowering in the future. Signed-off-by: Ian Romanick <ian.d.romanick@intel.com>
2010-11-18 17:54:07 -08:00
progress = lower_instructions(ir, SUB_TO_ADD_NEG) || progress;
glsl2: Move the common optimization passes to a helper function. These are passes that we expect all codegen to be happy with. The other lowering passes for Mesa IR are moved to the Mesa IR generator.
2010-08-10 13:06:49 -07:00
if (linked) {
progress = do_function_inlining(ir) || progress;
progress = do_dead_functions(ir) || progress;
glsl: Don't do structure splitting until link time. We were splitting on each side of an unlinked program, and the two sides lost track of which variables they referenced, resulting in assertion failure during validation. Fixes piglit link-struct-uniform-usage. Reviewed-by: Ian Romanick <ian.d.romanick@intel.com>
2011-09-07 12:04:57 -07:00
progress = do_structure_splitting(ir) || progress;
glsl2: Move the common optimization passes to a helper function. These are passes that we expect all codegen to be happy with. The other lowering passes for Mesa IR are moved to the Mesa IR generator.
2010-08-10 13:06:49 -07:00
}
progress = do_if_simplification(ir) || progress;
glsl: Add an optimization pass to flatten simple nested if blocks. GLBenchmark 2.7's shaders contain conditional blocks like: if (x) { if (y) { ... } } where the outer conditional's then clause contains exactly one statement (the nested if) and there are no else clauses. This can easily be optimized into: if (x && y) { ... } This saves a few instructions in GLBenchmark 2.7: total instructions in shared programs: 11833 -> 11649 (-1.55%) instructions in affected programs: 8234 -> 8050 (-2.23%) It also helps CS:GO slightly (-0.05%/-0.22%). More importantly, however, it simplifies the control flow graph, which could enable other optimizations. Signed-off-by: Kenneth Graunke <kenneth@whitecape.org> Reviewed-by: Matt Turner <mattst88@gmail.com> Reviewed-by: Eric Anholt <eric@anholt.net>
2013-04-03 23:56:57 -07:00
progress = opt_flatten_nested_if_blocks(ir) || progress;
glsl2: Move the common optimization passes to a helper function. These are passes that we expect all codegen to be happy with. The other lowering passes for Mesa IR are moved to the Mesa IR generator.
2010-08-10 13:06:49 -07:00
progress = do_copy_propagation(ir) || progress;
glsl/opt_cpe: Reenable opt_copy_propagation_elements.cpp pass.
2011-04-02 20:19:20 -07:00
progress = do_copy_propagation_elements(ir) || progress;
glsl: Add a pass to flip matrix/vector multiplies to use dot products. This pass flips (matrix * vector) operations to (vector * matrixTranspose) for certain built-in matrices (currently gl_ModelViewProjectionMatrix and gl_TextureMatrix). This is equivalent, but results in dot products rather than multiplies and adds. On some hardware, this is more efficient. This pass is conditionalized on ctx->mvp_with_dp4, the flag drivers set to indicate they prefer dot products. Improves performance in Lightsmark by 1.01131% +/- 0.162069% (n = 10) on a Haswell GT2 system. Passes Piglit on Ivybridge. v2: Use struct gl_shader_compiler_options instead of plumbing through another boolean flag for this purpose. Signed-off-by: Kenneth Graunke <kenneth@whitecape.org> Reviewed-by: Ian Romanick <ian.d.romanick@intel.com> Reviewed-by: Eric Anholt <eric@anholt.net>
2013-04-17 17:30:25 -07:00
if (options->PreferDP4 && !linked)
progress = opt_flip_matrices(ir) || progress;
glsl2: Move the common optimization passes to a helper function. These are passes that we expect all codegen to be happy with. The other lowering passes for Mesa IR are moved to the Mesa IR generator.
2010-08-10 13:06:49 -07:00
if (linked)
glsl: Add uniform_locations_assigned parameter to do_dead_code opt pass Setting this flag prevents declarations of uniforms from being removed from the IR. Since the IR is directly used by several API functions that query uniforms in shaders, uniform declarations cannot be removed after the locations have been set. However, it should still be safe to reorder the declarations (this is not tested). Signed-off-by: Ian Romanick <ian.d.romanick@intel.com> Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=41980 Tested-by: Brian Paul <brianp@vmware.com> Reviewed-by: Bryan Cain <bryancain3@gmail.com> Cc: Vinson Lee <vlee@vmware.com> Cc: José Fonseca <jfonseca@vmware.com> Reviewed-by: Kenneth Graunke <kenneth@whitecape.org> Reviewed-by: Yuanhan Liu <yuanhan.liu@linux.intel.com>
2011-10-21 11:17:39 -07:00
progress = do_dead_code(ir, uniform_locations_assigned) || progress;
glsl2: Move the common optimization passes to a helper function. These are passes that we expect all codegen to be happy with. The other lowering passes for Mesa IR are moved to the Mesa IR generator.
2010-08-10 13:06:49 -07:00
else
progress = do_dead_code_unlinked(ir) || progress;
progress = do_dead_code_local(ir) || progress;
progress = do_tree_grafting(ir) || progress;
progress = do_constant_propagation(ir) || progress;
if (linked)
progress = do_constant_variable(ir) || progress;
else
progress = do_constant_variable_unlinked(ir) || progress;
progress = do_constant_folding(ir) || progress;
glsl: Add a CSE pass. This only operates on constant/uniform values for now, because otherwise I'd have to deal with killing my available CSE entries when assignments happen, and getting even this working in the tree ir was painful enough. As is, it has the following effect in shader-db: total instructions in shared programs: 1524077 -> 1521964 (-0.14%) instructions in affected programs: 50629 -> 48516 (-4.17%) GAINED: 0 LOST: 0 And, for tropics, that accounts for most of the effect, the FPS improvement is 11.67% +/- 0.72% (n=3). v2: Use read_only field of the variable, manually check the lod_info union members, use get_num_operands(), rename cse_operands_visitor to is_cse_candidate_visitor, move all is-a-candidate logic to that function, and call it before checking for CSE on a given rvalue, more comments, use private keyword. Reviewed-by: Paul Berry <stereotype441@gmail.com>
2013-10-17 10:28:40 -07:00
progress = do_cse(ir) || progress;
glsl2: Move the common optimization passes to a helper function. These are passes that we expect all codegen to be happy with. The other lowering passes for Mesa IR are moved to the Mesa IR generator.
2010-08-10 13:06:49 -07:00
progress = do_algebraic(ir) || progress;
glsl: add continue/break/return unification/elimination pass (v2) Changes in v2: - Base class renamed to ir_control_flow_visitor - Tried to comply with coding style This is a new pass that supersedes ir_if_return and "lowers" jumps to if/else structures. Currently it causes no regressions on softpipe and nv40, but I'm not sure whether the piglit glsl tests are thorough enough, so consider this experimental. It can be asked to: 1. Pull jumps out of ifs where possible 2. Remove all "continue"s, replacing them with an "execute flag" 3. Replace all "break" with a single conditional one at the end of the loop 4. Replace all "return"s with a single return at the end of the function, for the main function and/or other functions This gives several great benefits: 1. All functions can be inlined after this pass 2. nv40 and other pre-DX10 chips without "continue" can be supported 3. nv30 and other pre-DX10 chips with no control flow at all are better supported Note that for full effect we should also teach the unroller to unroll loops with a fixed maximum number of iterations but with the canonical conditional "break" that this pass will insert if asked to. Continues are lowered by adding a per-loop "execute flag", initialized to TRUE, that when cleared inhibits all execution until the end of the loop. Breaks are lowered to continues, plus setting a "break flag" that is checked at the end of the loop, and trigger the unique "break". Returns are lowered to breaks/continues, plus adding a "return flag" that causes loops to break again out of their enclosing loops until all the loops are exited: then the "execute flag" logic will ignore everything until the end of the function. Note that "continue" and "return" can also be implemented by adding a dummy loop and using break. However, this is bad for hardware with limited nesting depth, and prevents further optimization, and thus is not currently performed.
2010-09-07 00:24:08 +02:00
progress = do_lower_jumps(ir) || progress;
glsl2: Move the common optimization passes to a helper function. These are passes that we expect all codegen to be happy with. The other lowering passes for Mesa IR are moved to the Mesa IR generator.
2010-08-10 13:06:49 -07:00
progress = do_vec_index_to_swizzle(ir) || progress;
glsl: Add lowering pass for ir_triop_vector_insert This will eventually replace do_vec_index_to_cond_assign. This lowering pass is called in all the places where do_vec_index_to_cond_assign or do_vec_index_to_swizzle is called. v2: Use WRITEMASK_* instead of integer literals. Use a more concise method of generating broadcast_index. Both suggested by Eric. v3: Use a series of scalar compares instead of a single vector compare. Suggested by Eric and Ken. It still uses 'if (cond) v.x = y;' instead of conditional assignments because ir_builder doesn't do conditional assignments, and I'd rather keep the code simple. Signed-off-by: Ian Romanick <ian.d.romanick@intel.com> Reviewed-by: Eric Anholt <eric@anholt.net> Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
2013-03-18 14:45:53 -07:00
progress = lower_vector_insert(ir, false) || progress;
glsl2: Move the common optimization passes to a helper function. These are passes that we expect all codegen to be happy with. The other lowering passes for Mesa IR are moved to the Mesa IR generator.
2010-08-10 13:06:49 -07:00
progress = do_swizzle_swizzle(ir) || progress;
glsl2: Add a pass to strip out noop swizzles. With the glsl2-965 branch, the optimization of glsl-algebraic-rcp-rcp regressed due to noop swizzles hiding information from ir_algebraic. This cleans up those noop swizzles for us.
2010-08-13 07:16:38 -07:00
progress = do_noop_swizzle(ir) || progress;
glsl2: Move the common optimization passes to a helper function. These are passes that we expect all codegen to be happy with. The other lowering passes for Mesa IR are moved to the Mesa IR generator.
2010-08-10 13:06:49 -07:00
glsl: Add an array splitting pass. I've had this code laying around almost done for a long time. The idea is like opt_structure_splitting, that we've got a bunch of transforms at the GLSL IR level that only understand scalars and vectors, which just skip complicated dereferences. While driver backends may manage some optimization after they split matrices up themselves, it would be better to bring all of our optimization to bear on the problem. While I wasn't expecting changes quite yet, a few programs end up winning: a gstreamer convolution shader, and the Humus dynamic branching demo: Total instructions: 269430 -> 269342 3/2148 programs affected (0.1%) 1498 -> 1410 instructions in affected programs (5.9% reduction)
2010-10-02 22:57:17 -07:00
progress = optimize_split_arrays(ir, linked) || progress;
glsl2: Add pass to remove redundant jumps
2010-09-13 14:25:26 -07:00
progress = optimize_redundant_jumps(ir) || progress;
glsl2: Perform initial bits of loop analysis during compilation
2010-08-26 16:45:22 -07:00
loop_state *ls = analyze_loop_variables(ir);
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).
2011-01-17 22:07:55 -08:00
if (ls->loop_found) {
progress = set_loop_controls(ir, ls) || progress;
progress = unroll_loops(ir, ls, max_unroll_iterations) || progress;
}
glsl2: Perform initial bits of loop analysis during compilation
2010-08-26 16:45:22 -07:00
delete ls;
glsl2: Move the common optimization passes to a helper function. These are passes that we expect all codegen to be happy with. The other lowering passes for Mesa IR are moved to the Mesa IR generator.
2010-08-10 13:06:49 -07:00
return progress;
}
glsl2: Free the shader compiler at dri screen destruction. Hooray, we can valgrind again without adding suppressions. This also adds an interface for use by an implementation of glReleaseShaderCompiler().
2010-08-18 16:56:39 -07:00
extern "C" {
/**
* To be called at GL teardown time, this frees compiler datastructures.
*
* After calling this, any previously compiled shaders and shader
* programs would be invalid. So this should happen at approximately
* program exit.
*/
void
_mesa_destroy_shader_compiler(void)
{
_mesa_destroy_shader_compiler_caches();
_mesa_glsl_release_types();
}
/**
* Releases compiler caches to trade off performance for memory.
*
* Intended to be used with glReleaseShaderCompiler().
*/
void
_mesa_destroy_shader_compiler_caches(void)
{
glsl: Switch to the new built-in function module. All built-ins are now handled by the new code; the old system is dead. Signed-off-by: Kenneth Graunke <kenneth@whitecape.org> Reviewed-by: Matt Turner <mattst88@gmail.com> Reviewed-by: Paul Berry <stereotype441@gmail.com>
2013-09-01 20:48:45 -07:00
_mesa_glsl_release_builtin_functions();
glsl2: Free the shader compiler at dri screen destruction. Hooray, we can valgrind again without adding suppressions. This also adds an interface for use by an implementation of glReleaseShaderCompiler().
2010-08-18 16:56:39 -07:00
}
}
Reference in a new issue Copy permalink