X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fcore%2Fpipelinestate.cpp;h=4dc54e2403ffea9288375df8dbfa09eb01f50283;hb=fcc065736e303088ef121c554318e0cc028a0666;hp=5ad51502010a1b1c2a2c37e7dd21b2a680dbdf2f;hpb=63458ee3bedacf4d498074fcec15600a4932ae7b;p=libs%2Fgl.git

diff --git a/source/core/pipelinestate.cpp b/source/core/pipelinestate.cpp
index 5ad51502..4dc54e24 100644
--- a/source/core/pipelinestate.cpp
+++ b/source/core/pipelinestate.cpp
@@ -70,11 +70,21 @@ 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");
 
+	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 ? TEXTURE : NO_RESOURCE);
+	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;
@@ -82,7 +92,7 @@ void PipelineState::set_texture(unsigned binding, const Texture *tex, int level,
 		i->sampler = samp;
 		i->mip_level = level;
 		i->changed = true;
-		i->used = (tex && samp);
+		i->used = tex;
 		changes |= RESOURCES;
 	}
 }