Handle OpPhi when specializing SPIR-V modules

[libs/gl.git] / source / core / pipelinestate.cpp

diff --git a/source/core/pipelinestate.cpp b/source/core/pipelinestate.cpp
index 8d59a31624eddc823e23cd7260ed444c4efc9129..6078db5d0aa24d39bfb9fcf0a8ce1187e5215dcf 100644 (file)
--- a/source/core/pipelinestate.cpp
+++ b/source/core/pipelinestate.cpp
@@ -1,7 +1,9 @@
 #include <stdexcept>
 #include <msp/core/algorithm.h>
+#include <msp/io/print.h>
 #include "error.h"
 #include "pipelinestate.h"
+#include "program.h"
 #include "uniformblock.h"
 
 using namespace std;
@@ -41,17 +43,20 @@ void PipelineState::set_shader_program(const Program *p)
 
 void PipelineState::set_uniform_block(int binding, const UniformBlock *block)
 {
-       auto i = lower_bound_member(uniform_blocks, binding, &BoundUniformBlock::binding);
-       if(i==uniform_blocks.end() || i->binding!=binding)
-               i = uniform_blocks.insert(i, BoundUniformBlock(binding));
+       auto i = lower_bound_member(resources, binding, &BoundResource::binding);
+       if(i==resources.end() || i->binding!=binding)
+               i = resources.insert(i, BoundResource(binding));
+
+       ResourceType type = (block ? UNIFORM_BLOCK : NO_RESOURCE);
        const Buffer *buffer = (block ? block->get_buffer() : 0);
-       if(block!=i->block || buffer!=i->buffer || binding<0)
+       if(i->type!=type || block!=i->block || buffer!=i->buffer || binding<0)
        {
+               i->type = type;
                i->block = block;
                i->buffer = buffer;
                i->changed = true;
                i->used = block;
-               changes |= UNIFORMS;
+               changes |= RESOURCES;
        }
 }
 
@@ -67,17 +72,30 @@ void PipelineState::set_texture(unsigned binding, const Texture *tex, int level,
        if(level>=0 && !can_bind_tex_level(level))
                throw invalid_operation("PipelineState::set_texture");
 
-       auto i = lower_bound_member(textures, binding, &BoundTexture::binding);
-       if(i==textures.end() || i->binding!=binding)
-               i = textures.insert(i, BoundTexture(binding));
-       if(tex!=i->texture || level!=i->level || samp!=i->sampler)
+       set_texture_resource(binding, tex, level, samp);
+}
+
+void PipelineState::set_storage_texture(unsigned binding, const Texture *tex)
+{
+       set_texture_resource(binding, tex, 0, 0);
+}
+
+void PipelineState::set_texture_resource(unsigned binding, const Texture *tex, int level, const Sampler *samp)
+{
+       auto i = lower_bound_member(resources, static_cast<int>(binding), &BoundResource::binding);
+       if(i==resources.end() || i->binding!=static_cast<int>(binding))
+               i = resources.insert(i, BoundResource(binding));
+
+       ResourceType type = (tex ? samp ? SAMPLED_TEXTURE : STORAGE_TEXTURE : NO_RESOURCE);
+       if(i->type!=type || tex!=i->texture || level!=i->mip_level || samp!=i->sampler)
        {
+               i->type = type;
                i->texture = tex;
                i->sampler = samp;
-               i->level = level;
+               i->mip_level = level;
                i->changed = true;
-               i->used = (tex && samp);
-               changes |= TEXTURES;
+               i->used = tex;
+               changes |= RESOURCES;
        }
 }
 
@@ -91,6 +109,11 @@ void PipelineState::set_primitive_type(PrimitiveType t)
        set(primitive_type, t, PRIMITIVE_TYPE);
 }
 
+void PipelineState::set_patch_size(unsigned s)
+{
+       set(patch_size, s, PATCH_SIZE);
+}
+
 void PipelineState::set_front_face(FaceWinding w)
 {
        set(front_face, w, FACE_CULL);
@@ -116,5 +139,27 @@ void PipelineState::set_blend(const Blend &b)
        set(blend, b, BLEND);
 }
 
+void PipelineState::check_bound_resources() const
+{
+       if(!shprog)
+               return;
+
+       for(const ReflectData::UniformBlockInfo &b: shprog->get_uniform_blocks())
+               if(b.bind_point!=ReflectData::DEFAULT_BLOCK)
+               {
+                       auto i = lower_bound_member(resources, b.bind_point, &PipelineState::BoundResource::binding);
+                       if(i==resources.end() || i->binding!=b.bind_point)
+                               IO::print(IO::cerr, "Warning: No resource present for uniform block binding %d:%d (%s)\n", b.bind_point>>20, b.bind_point&0xFFFFF, b.name);
+               }
+
+       for(const ReflectData::UniformInfo &u: shprog->get_uniforms())
+               if(u.binding>=0 && is_image(u.type))
+               {
+                       auto i = lower_bound_member(resources, u.binding, &PipelineState::BoundResource::binding);
+                       if(i==resources.end() || i->binding!=u.binding)
+                               IO::print(IO::cerr, "Warning: No resource present for texture binding %d:%d (%s)\n", u.binding>>20, u.binding&0xFFFFF, u.name);
+               }
+}
+
 } // namespace GL
 } // namespace Msp