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

glsl: Implement ARB_texture_query_lod

Browse Source 
v2 [mattst88]:
   - Rebase.
   - #define GL_ARB_texture_query_lod to 1.
   - Remove comma after ir_lod in ir.h for MSVC.
   - Handled ir_lod in ir_hv_accept.cpp, ir_rvalue_visitor.cpp,
     opt_tree_grafting.cpp.
   - Rename textureQueryLOD to textureQueryLod, see
     https://www.khronos.org/bugzilla/show_bug.cgi?id=821
   - Fix ir_reader of (lod ...).
v3 [mattst88]:
   - Rename textureQueryLod to textureQueryLOD, pending resolution of
     Khronos 821.
   - Add ir_lod case to ir_to_mesa.cpp.

Reviewed-by: Matt Turner <mattst88@gmail.com>
Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
This commit is contained in:
Dave Airlie
2012-09-23 19:50:41 +10:00
committed by Matt Turner
parent 0e0ab8a071
commit 110ca8b1f3
18 changed files with 101 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
src/glsl/builtins/profiles/ARB_texture_query_lod.frag Normal file
View File

@@ -0,0 +1,38 @@
#version 130
#extension GL_ARB_texture_query_lod : enable
#extension GL_ARB_texture_cube_map_array : enable
vec2 textureQueryLOD( sampler1D sampler, float coord);
vec2 textureQueryLOD(isampler1D sampler, float coord);
vec2 textureQueryLOD(usampler1D sampler, float coord);
vec2 textureQueryLOD( sampler2D sampler, vec2 coord);
vec2 textureQueryLOD(isampler2D sampler, vec2 coord);
vec2 textureQueryLOD(usampler2D sampler, vec2 coord);
vec2 textureQueryLOD( sampler3D sampler, vec3 coord);
vec2 textureQueryLOD(isampler3D sampler, vec3 coord);
vec2 textureQueryLOD(usampler3D sampler, vec3 coord);
vec2 textureQueryLOD( samplerCube sampler, vec3 coord);
vec2 textureQueryLOD(isamplerCube sampler, vec3 coord);
vec2 textureQueryLOD(usamplerCube sampler, vec3 coord);
vec2 textureQueryLOD( sampler1DArray sampler, float coord);
vec2 textureQueryLOD(isampler1DArray sampler, float coord);
vec2 textureQueryLOD(usampler1DArray sampler, float coord);
vec2 textureQueryLOD( sampler2DArray sampler, vec2 coord);
vec2 textureQueryLOD(isampler2DArray sampler, vec2 coord);
vec2 textureQueryLOD(usampler2DArray sampler, vec2 coord);
vec2 textureQueryLOD( samplerCubeArray sampler, vec3 coord);
vec2 textureQueryLOD(isamplerCubeArray sampler, vec3 coord);
vec2 textureQueryLOD(usamplerCubeArray sampler, vec3 coord);
vec2 textureQueryLOD(sampler1DShadow sampler, float coord);
vec2 textureQueryLOD(sampler2DShadow sampler, vec2 coord);
vec2 textureQueryLOD(samplerCubeShadow sampler, vec3 coord);
vec2 textureQueryLOD(sampler1DArrayShadow sampler, float coord);
vec2 textureQueryLOD(sampler2DArrayShadow sampler, vec2 coord);
vec2 textureQueryLOD(samplerCubeArrayShadow sampler, vec3 coord);

1
src/glsl/builtins/tools/generate_builtins.py
View File

@@ -191,6 +191,7 @@ read_builtins(GLenum target, const char *protos, const char **functions, unsigne
st->ARB_texture_cube_map_array_enable = true;
st->ARB_shading_language_packing_enable = true;
st->ARB_texture_multisample_enable = true;
st->ARB_texture_query_lod_enable = true;
_mesa_glsl_initialize_types(st);
sh->ir = new(sh) exec_list;

40
src/glsl/builtins/tools/texture_builtins.py
View File

@@ -33,29 +33,29 @@ def get_sampler_dim(sampler_type):
# Get the coordinate dimension for a given sampler type.
# Array samplers also get +1 here since the layer is really an extra coordinate
def get_coord_dim(sampler_type):
def get_coord_dim(sampler_type, tex_inst):
coord_dim = get_sampler_dim(sampler_type)
if sampler_type.find("Array") != -1:
if sampler_type.find("Array") != -1 and tex_inst != "lod":
coord_dim += 1
return coord_dim
# Get the number of extra vector components (i.e. shadow comparitor)
def get_extra_dim(sampler_type, use_proj, unused_fields):
def get_extra_dim(sampler_type, use_proj, unused_fields, tex_inst):
extra_dim = unused_fields
if sampler_type == "CubeArrayShadow":
return 0
if sampler_type.find("Shadow") != -1:
if sampler_type.find("Shadow") != -1 and tex_inst != "lod":
extra_dim += 1
if use_proj:
extra_dim += 1
return extra_dim
def get_txs_dim(sampler_type):
def get_txs_dim(sampler_type, tex_inst):
if sampler_type.startswith("CubeArray"):
return 3
if sampler_type.startswith("Cube"):
return 2
return get_coord_dim(sampler_type)
return get_coord_dim(sampler_type, tex_inst)
def has_lod(sampler_type):
if 'Buffer' in sampler_type: return False
@@ -64,14 +64,16 @@ def has_lod(sampler_type):
return True
def generate_sigs(g, tex_inst, sampler_type, variant = 0, unused_fields = 0):
coord_dim = get_coord_dim(sampler_type)
extra_dim = get_extra_dim(sampler_type, variant & Proj, unused_fields)
coord_dim = get_coord_dim(sampler_type, tex_inst)
extra_dim = get_extra_dim(sampler_type, variant & Proj, unused_fields, tex_inst)
sampler_dim = get_sampler_dim(sampler_type)
if variant & Single:
return_type = "float"
elif tex_inst == "txs":
return_type = vec_type("i", get_txs_dim(sampler_type))
return_type = vec_type("i", get_txs_dim(sampler_type, tex_inst))
elif tex_inst == "lod":
return_type = "vec2"
else:
return_type = g + "vec4"
@@ -108,14 +110,14 @@ def generate_sigs(g, tex_inst, sampler_type, variant = 0, unused_fields = 0):
else:
print "(var_ref P)",
if tex_inst not in ['txf_ms', 'txs']:
if tex_inst not in ['txf_ms', 'txs', 'lod']:
# Coordinate offset
if variant & Offset:
print "(var_ref offset)",
else:
print "0",
if tex_inst not in ['txf', 'txf_ms', 'txs']:
if tex_inst not in ['txf', 'txf_ms', 'txs', 'lod']:
# Projective divisor
if variant & Proj:
print "(swiz " + "xyzw"[coord_dim + extra_dim-1] + " (var_ref P))",
@@ -635,6 +637,22 @@ def generate_texture_functions(fs):
generate_sigs("", "txl", "2DShadow", Proj)
end_function(fs, "shadow2DProjLod")
start_function("textureQueryLOD")
generate_fiu_sigs("lod", "1D")
generate_fiu_sigs("lod", "2D")
generate_fiu_sigs("lod", "3D")
generate_fiu_sigs("lod", "Cube")
generate_fiu_sigs("lod", "1DArray")
generate_fiu_sigs("lod", "2DArray")
generate_fiu_sigs("lod", "CubeArray")
generate_sigs("", "lod", "1DShadow")
generate_sigs("", "lod", "2DShadow")
generate_sigs("", "lod", "CubeShadow")
generate_sigs("", "lod", "1DArrayShadow")
generate_sigs("", "lod", "2DArrayShadow")
generate_sigs("", "lod", "CubeArrayShadow")
end_function(fs, "textureQueryLOD")
sys.stdout = sys.__stdout__
return fs

3
src/glsl/glcpp/glcpp-parse.y
View File

@@ -1233,6 +1233,9 @@ glcpp_parser_create (const struct gl_extensions *extensions, int api)
if (extensions->ARB_texture_multisample)
add_builtin_define(parser, "GL_ARB_texture_multisample", 1);
if (extensions->ARB_texture_query_lod)
add_builtin_define(parser, "GL_ARB_texture_query_lod", 1);
}
}

1
src/glsl/glsl_parser_extras.cpp
View File

@@ -467,6 +467,7 @@ static const _mesa_glsl_extension _mesa_glsl_supported_extensions[] = {
EXT(ARB_texture_cube_map_array, true, false, true, true, false, ARB_texture_cube_map_array),
EXT(ARB_shading_language_packing, true, false, true, true, false, ARB_shading_language_packing),
EXT(ARB_texture_multisample, true, false, true, true, false, ARB_texture_multisample),
EXT(ARB_texture_query_lod, false, false, true, true, false, ARB_texture_query_lod),
};
#undef EXT

2
src/glsl/glsl_parser_extras.h
View File

@@ -282,6 +282,8 @@ struct _mesa_glsl_parse_state {
bool ARB_shading_language_packing_warn;
bool ARB_texture_multisample_enable;
bool ARB_texture_multisample_warn;
bool ARB_texture_query_lod_enable;
bool ARB_texture_query_lod_warn;
/*@}*/
/** Extensions supported by the OpenGL implementation. */

5
src/glsl/ir.cpp
View File

@@ -1307,7 +1307,7 @@ ir_dereference::is_lvalue() const
}
static const char *tex_opcode_strs[] = { "tex", "txb", "txl", "txd", "txf", "txf_ms", "txs" };
static const char *tex_opcode_strs[] = { "tex", "txb", "txl", "txd", "txf", "txf_ms", "txs", "lod" };
const char *ir_texture::opcode_string()
{
@@ -1338,6 +1338,9 @@ ir_texture::set_sampler(ir_dereference *sampler, const glsl_type *type)
if (this->op == ir_txs) {
assert(type->base_type == GLSL_TYPE_INT);
} else if (this->op == ir_lod) {
assert(type->vector_elements == 2);
assert(type->base_type == GLSL_TYPE_FLOAT);
} else {
assert(sampler->type->sampler_type == (int) type->base_type);
if (sampler->type->sampler_shadow)

4
src/glsl/ir.h
View File

@@ -1426,7 +1426,8 @@ enum ir_texture_opcode {
ir_txd, /**< Texture look-up with partial derivatvies */
ir_txf, /**< Texel fetch with explicit LOD */
ir_txf_ms, /**< Multisample texture fetch */
ir_txs /**< Texture size */
ir_txs, /**< Texture size */
ir_lod /**< Texture lod query */
};
@@ -1450,6 +1451,7 @@ enum ir_texture_opcode {
* (txf_ms
* <type> <sampler> <coordinate> <sample_index>)
* (txs <type> <sampler> <lod>)
* (lod <type> <sampler> <coordinate>)
*/
class ir_texture : public ir_rvalue {
public:

1
src/glsl/ir_clone.cpp
View File

@@ -243,6 +243,7 @@ ir_texture::clone(void *mem_ctx, struct hash_table *ht) const
switch (this->op) {
case ir_tex:
case ir_lod:
break;
case ir_txb:
new_tex->lod_info.bias = this->lod_info.bias->clone(mem_ctx, ht);

1
src/glsl/ir_hv_accept.cpp
View File

@@ -213,6 +213,7 @@ ir_texture::accept(ir_hierarchical_visitor *v)
switch (this->op) {
case ir_tex:
case ir_lod:
break;
case ir_txb:
s = this->lod_info.bias->accept(v);

1
src/glsl/ir_print_visitor.cpp
View File

@@ -278,6 +278,7 @@ void ir_print_visitor::visit(ir_texture *ir)
switch (ir->op)
{
case ir_tex:
case ir_lod:
break;
case ir_txb:
ir->lod_info.bias->accept(this);

14
src/glsl/ir_reader.cpp
View File

@@ -917,6 +917,8 @@ ir_reader::read_texture(s_expression *expr)
s_pattern tex_pattern[] =
{ "tex", s_type, s_sampler, s_coord, s_offset, s_proj, s_shadow };
s_pattern lod_pattern[] =
{ "lod", s_type, s_sampler, s_coord };
s_pattern txf_pattern[] =
{ "txf", s_type, s_sampler, s_coord, s_offset, s_lod };
s_pattern txf_ms_pattern[] =
@@ -926,7 +928,9 @@ ir_reader::read_texture(s_expression *expr)
s_pattern other_pattern[] =
{ tag, s_type, s_sampler, s_coord, s_offset, s_proj, s_shadow, s_lod };
if (MATCH(expr, tex_pattern)) {
if (MATCH(expr, lod_pattern)) {
op = ir_lod;
} else if (MATCH(expr, tex_pattern)) {
op = ir_tex;
} else if (MATCH(expr, txf_pattern)) {
op = ir_txf;
@@ -939,7 +943,7 @@ ir_reader::read_texture(s_expression *expr)
if (op == -1)
return NULL;
} else {
ir_read_error(NULL, "unexpected texture pattern");
ir_read_error(NULL, "unexpected texture pattern %s", tag->value());
return NULL;
}
@@ -971,7 +975,7 @@ ir_reader::read_texture(s_expression *expr)
return NULL;
}
if (op != ir_txf_ms) {
if (op != ir_txf_ms && op != ir_lod) {
// Read texel offset - either 0 or an rvalue.
s_int *si_offset = SX_AS_INT(s_offset);
if (si_offset == NULL || si_offset->value() != 0) {
@@ -984,7 +988,7 @@ ir_reader::read_texture(s_expression *expr)
}
}
if (op != ir_txf && op != ir_txf_ms && op != ir_txs) {
if (op != ir_txf && op != ir_txf_ms && op != ir_txs && op != ir_lod) {
s_int *proj_as_int = SX_AS_INT(s_proj);
if (proj_as_int && proj_as_int->value() == 1) {
tex->projector = NULL;
@@ -1054,7 +1058,7 @@ ir_reader::read_texture(s_expression *expr)
break;
}
default:
// tex doesn't have any extra parameters.
// tex and lod don't have any extra parameters.
break;
};
return tex;

1
src/glsl/ir_rvalue_visitor.cpp
View File

@@ -57,6 +57,7 @@ ir_rvalue_base_visitor::rvalue_visit(ir_texture *ir)
switch (ir->op) {
case ir_tex:
case ir_lod:
break;
case ir_txb:
handle_rvalue(&ir->lod_info.bias);

1
src/glsl/opt_tree_grafting.cpp
View File

@@ -274,6 +274,7 @@ ir_tree_grafting_visitor::visit_enter(ir_texture *ir)
switch (ir->op) {
case ir_tex:
case ir_lod:
break;
case ir_txb:
if (do_graft(&ir->lod_info.bias))

1
src/glsl/standalone_scaffolding.cpp
View File

@@ -103,6 +103,7 @@ void initialize_context_to_defaults(struct gl_context *ctx, gl_api api)
ctx->Extensions.OES_standard_derivatives = true;
ctx->Extensions.ARB_texture_cube_map_array = true;
ctx->Extensions.ARB_texture_multisample = true;
ctx->Extensions.ARB_texture_query_lod = true;
ctx->Const.GLSLVersion = 120;

1
src/mesa/main/extensions.c
View File

@@ -144,6 +144,7 @@ static const struct extension extension_table[] = {
{ "GL_ARB_texture_mirrored_repeat", o(dummy_true), GLL, 2001 },
{ "GL_ARB_texture_multisample", o(ARB_texture_multisample), GL, 2009 },
{ "GL_ARB_texture_non_power_of_two", o(ARB_texture_non_power_of_two), GL, 2003 },
{ "GL_ARB_texture_query_lod", o(ARB_texture_query_lod), GL, 2009 },
{ "GL_ARB_texture_rectangle", o(NV_texture_rectangle), GL, 2004 },
{ "GL_ARB_texture_rgb10_a2ui", o(ARB_texture_rgb10_a2ui), GL, 2009 },
{ "GL_ARB_texture_rg", o(ARB_texture_rg), GL, 2008 },

1
src/mesa/main/mtypes.h
View File

@@ -3002,6 +3002,7 @@ struct gl_extensions
GLboolean ARB_texture_float;
GLboolean ARB_texture_multisample;
GLboolean ARB_texture_non_power_of_two;
GLboolean ARB_texture_query_lod;
GLboolean ARB_texture_rg;
GLboolean ARB_texture_rgb10_a2ui;
GLboolean ARB_texture_storage;

3
src/mesa/program/ir_to_mesa.cpp
View File

@@ -2048,6 +2048,9 @@ ir_to_mesa_visitor::visit(ir_texture *ir)
case ir_txf_ms:
assert(!"Unexpected ir_txf_ms opcode");
break;
case ir_lod:
assert(!"Unexpected ir_lod opcode");
break;
}
const glsl_type *sampler_type = ir->sampler->type;