X-Git-Url: http://git.tdb.fi/?p=libs%2Fgl.git;a=blobdiff_plain;f=source%2Fbackends%2Fopengl%2Fprogram_backend.cpp;h=398d35ce7a6c364aba56634cb7aa0be67ad174d6;hp=f90315c0dd3e5373a6b3cb363f079e981087564c;hb=cebf1330ef6773b7b4496dc279ec02a7ca4351bb;hpb=2a70fecfbbe8708be2bdaa75d222dd5a889a8ed3

diff --git a/source/backends/opengl/program_backend.cpp b/source/backends/opengl/program_backend.cpp
index f90315c0..398d35ce 100644
--- a/source/backends/opengl/program_backend.cpp
+++ b/source/backends/opengl/program_backend.cpp
@@ -1,5 +1,6 @@
 #include <cstring>
 #include <msp/core/algorithm.h>
+#include <msp/gl/extensions/arb_compute_shader.h>
 #include <msp/gl/extensions/arb_es2_compatibility.h>
 #include <msp/gl/extensions/arb_fragment_shader.h>
 #include <msp/gl/extensions/arb_gl_spirv.h>
@@ -81,6 +82,7 @@ unsigned OpenGLProgram::add_stage(Stage type)
 	case VERTEX: { static Require _req(ARB_vertex_shader); gl_type = GL_VERTEX_SHADER; } break;
 	case GEOMETRY: { static Require _req(ARB_geometry_shader4); gl_type = GL_GEOMETRY_SHADER; } break;
 	case FRAGMENT: { static Require _req(ARB_fragment_shader); gl_type = GL_FRAGMENT_SHADER; } break;
+	case COMPUTE: { static Require _req(ARB_compute_shader); gl_type = GL_COMPUTE_SHADER; } break;
 	default: throw invalid_argument("OpenGLProgram::add_stage");
 	}
 
@@ -123,6 +125,7 @@ void OpenGLProgram::add_glsl_stages(const GlslModule &mod, const map<string, int
 		case SL::Stage::VERTEX: stage_id = add_stage(VERTEX); break;
 		case SL::Stage::GEOMETRY: stage_id = add_stage(GEOMETRY); break;
 		case SL::Stage::FRAGMENT: stage_id = add_stage(FRAGMENT); break;
+		case SL::Stage::COMPUTE: stage_id = add_stage(COMPUTE); break;
 		default: throw invalid_operation("OpenGLProgram::add_glsl_stages");
 		}
 
@@ -152,6 +155,12 @@ void OpenGLProgram::add_glsl_stages(const GlslModule &mod, const map<string, int
 	link(mod);
 	query_uniforms();
 	query_attributes();
+	if(is_compute())
+	{
+		int wg_size[3];
+		glGetProgramiv(id, GL_COMPUTE_WORK_GROUP_SIZE, wg_size);
+		rd.compute_wg_size = LinAl::Vector<unsigned, 3>(wg_size[0], wg_size[1], wg_size[2]);
+	}
 
 	const map<string, unsigned> &block_bindings = compiler.get_uniform_block_bindings();
 	if(!block_bindings.empty())
@@ -222,6 +231,7 @@ void OpenGLProgram::add_spirv_stages(const SpirVModule &mod, const map<string, i
 		case SpirVModule::VERTEX: stage_id = add_stage(VERTEX); break;
 		case SpirVModule::GEOMETRY: stage_id = add_stage(GEOMETRY); break;
 		case SpirVModule::FRAGMENT: stage_id = add_stage(FRAGMENT); break;
+		case SpirVModule::COMPUTE: stage_id = add_stage(COMPUTE); break;
 		default: throw invalid_operation("OpenGLProgram::add_spirv_stages");
 		}
 
@@ -533,7 +543,7 @@ void OpenGLProgram::set_debug_name(const string &name)
 void OpenGLProgram::set_stage_debug_name(unsigned stage_id, Stage type)
 {
 #ifdef DEBUG
-	static const char *const suffixes[] = { " [VS]", " [GS]", " [FS]" };
+	static const char *const suffixes[] = { " [VS]", " [GS]", " [FS]", " [CS]" };
 	string name = debug_name+suffixes[type];
 	glObjectLabel(GL_SHADER, stage_id, name.size(), name.c_str());
 #else