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

glsl: allow bindless samplers/images as vertex shader inputs

Browse Source 
From section 4.3.4 of the ARB_bindless_texture spec:

   "(modify third paragraph of the section to allow sampler and
    image types) ...  Vertex shader inputs can only be float,
    single-precision floating-point scalars, single-precision
    floating-point vectors, matrices, signed and unsigned integers
    and integer vectors, sampler and image types."

v3: - update spec comment formatting

Signed-off-by: Samuel Pitoiset <samuel.pitoiset@gmail.com>
Reviewed-by: Timothy Arceri <tarceri@itsqueeze.com>
Reviewed-by: Nicolai Hähnle <nicolai.haehnle@amd.com>
This commit is contained in:
Samuel Pitoiset
2017-03-20 21:37:03 +01:00
parent 015c0b4a34
commit 8834c74fef
1 changed files with 14 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/compiler/glsl/ast_to_hir.cpp
View File

@@ -5097,6 +5097,14 @@ ast_declarator_list::hir(exec_list *instructions,
* vectors, matrices, signed and unsigned integers and integer * vectors, matrices, signed and unsigned integers and integer
* vectors. Vertex shader inputs cannot be arrays or * vectors. Vertex shader inputs cannot be arrays or
* structures." * structures."
*
* From section 4.3.4 of the ARB_bindless_texture spec:
*
* "(modify third paragraph of the section to allow sampler and
* image types) ... Vertex shader inputs can only be float,
* single-precision floating-point scalars, single-precision
* floating-point vectors, matrices, signed and unsigned
* integers and integer vectors, sampler and image types."
*/ */
const glsl_type *check_type = var->type->without_array(); const glsl_type *check_type = var->type->without_array();
@@ -5113,6 +5121,12 @@ ast_declarator_list::hir(exec_list *instructions,
case GLSL_TYPE_DOUBLE: case GLSL_TYPE_DOUBLE:
if (check_type->is_double() && (state->is_version(410, 0) || state->ARB_vertex_attrib_64bit_enable)) if (check_type->is_double() && (state->is_version(410, 0) || state->ARB_vertex_attrib_64bit_enable))
break; break;
case GLSL_TYPE_SAMPLER:
if (check_type->is_sampler() && state->has_bindless())
break;
case GLSL_TYPE_IMAGE:
if (check_type->is_image() && state->has_bindless())
break;
/* FALLTHROUGH */ /* FALLTHROUGH */
default: default:
_mesa_glsl_error(& loc, state, _mesa_glsl_error(& loc, state,