X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fglsl%2Fspirv.cpp;h=72f73bd56bdf9c4ff1d3738342986b6fbf7a315f;hb=c4d81a13ca8ac1479eca78ee190f3762ef3cbec4;hp=186521c5efe109b1bfcb1f6d331cfb666f2617fa;hpb=ece3438c6a1630ada39cc01ae3d54b27aacdd663;p=libs%2Fgl.git

diff --git a/source/glsl/spirv.cpp b/source/glsl/spirv.cpp
index 186521c5..72f73bd5 100644
--- a/source/glsl/spirv.cpp
+++ b/source/glsl/spirv.cpp
@@ -108,6 +108,8 @@ const SpirVGenerator::BuiltinFunctionInfo SpirVGenerator::builtin_functions[] =
 	{ "findMSB", "i", "GLSL.std.450", GLSL450_FIND_S_MSB, { 1 }, 0, 0 },
 	{ "findMSB", "u", "GLSL.std.450", GLSL450_FIND_U_MSB, { 1 }, 0, 0 },
 	{ "textureSize", "", "", 0, { }, CAP_IMAGE_QUERY, &SpirVGenerator::visit_builtin_texture_query },
+	{ "textureQueryLod", "", "", 0, { }, CAP_IMAGE_QUERY, &SpirVGenerator::visit_builtin_texture_query },
+	{ "textureQueryLevels", "", "", 0, { }, CAP_IMAGE_QUERY, &SpirVGenerator::visit_builtin_texture_query },
 	{ "texture", "", "", 0, { }, 0, &SpirVGenerator::visit_builtin_texture },
 	{ "textureLod", "", "", 0, { }, 0, &SpirVGenerator::visit_builtin_texture },
 	{ "texelFetch", "", "", 0, { }, 0, &SpirVGenerator::visit_builtin_texel_fetch },
@@ -1292,6 +1294,10 @@ void SpirVGenerator::visit_builtin_texture_query(FunctionCall &call, const vecto
 	Opcode opcode;
 	if(call.name=="textureSize")
 		opcode = OP_IMAGE_QUERY_SIZE_LOD;
+	else if(call.name=="textureQueryLod")
+		opcode = OP_IMAGE_QUERY_LOD;
+	else if(call.name=="textureQueryLevels")
+		opcode = OP_IMAGE_QUERY_LEVELS;
 	else
 		throw internal_error("invalid texture query call");
 
@@ -1896,6 +1902,7 @@ void SpirVGenerator::visit(Iteration &iter)
 	writer.write_op(content.function_body, OP_BRANCH, header_id);
 
 	writer.write_op_label(merge_block_id);
+	prune_loads(header_id);
 	reachable = true;
 }