X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fbackends%2Fopengl%2Fcommands_backend.cpp;h=97b4f12c7400857cb9f31162bb5f19180817c686;hb=4cd245dafe6a7ee5c93edca5aee2d146f1155309;hp=fd66b99cacf35c63b2f0eb8394828d939aabb76a;hpb=160e9eea29bd10034733d59507fa1bcca36be401;p=libs%2Fgl.git

diff --git a/source/backends/opengl/commands_backend.cpp b/source/backends/opengl/commands_backend.cpp
index fd66b99c..97b4f12c 100644
--- a/source/backends/opengl/commands_backend.cpp
+++ b/source/backends/opengl/commands_backend.cpp
@@ -18,10 +18,6 @@ using namespace std;
 namespace Msp {
 namespace GL {
 
-OpenGLCommands::OpenGLCommands():
-	pipeline_state(0)
-{ }
-
 void OpenGLCommands::use_pipeline(const PipelineState *ps)
 {
 	pipeline_state = ps;
@@ -31,46 +27,32 @@ void OpenGLCommands::use_pipeline(const PipelineState *ps)
 
 void OpenGLCommands::clear(const ClearValue *values)
 {
-	const Framebuffer *target = pipeline_state->get_framebuffer();
+	const Framebuffer *target = (pipeline_state ? pipeline_state->get_framebuffer() : 0);
 	if(!target)
 		throw invalid_operation("OpenGLCommands::clear");
 
-	if(!ARB_direct_state_access)
-	{
-		static Require _req(MSP_clear_buffer);
-		pipeline_state->apply();
-	}
+	static Require _req(MSP_clear_buffer);
+
+	pipeline_state->apply();
 
 	unsigned i = 0;
 	for(FrameAttachment a: target->get_format())
 	{
 		if(get_attach_point(a)==get_attach_point(DEPTH_ATTACHMENT))
-		{
-			if(ARB_direct_state_access)
-				glClearNamedFramebufferfv(target->id, GL_DEPTH, 0, &values->depth_stencil.depth);
-			else
-				glClearBufferfv(GL_DEPTH, 0, &values->depth_stencil.depth);
-		}
+			glClearBufferfv(GL_DEPTH, 0, &values->depth_stencil.depth);
 		else if(get_attach_point(a)==get_attach_point(STENCIL_ATTACHMENT))
-		{
-			if(ARB_direct_state_access)
-				glClearNamedFramebufferiv(target->id, GL_STENCIL, 0, &values->depth_stencil.stencil);
-			else
-				glClearBufferiv(GL_STENCIL, 0, &values->depth_stencil.stencil);
-		}
+			glClearBufferiv(GL_STENCIL, 0, &values->depth_stencil.stencil);
 		else
-		{
-			if(ARB_direct_state_access)
-				glClearNamedFramebufferfv(target->id, GL_COLOR, i++, &values->color.r);
-			else
-				glClearBufferfv(GL_COLOR, i++, &values->color.r);
-		}
+			glClearBufferfv(GL_COLOR, i++, &values->color.r);
 		++values;
 	}
 }
 
 void OpenGLCommands::draw(const Batch &batch)
 {
+	if(!pipeline_state)
+		throw invalid_operation("OpenGLCommands::draw");
+
 	pipeline_state->apply();
 	void *data_ptr = reinterpret_cast<void *>(batch.get_offset());
 	glDrawElements(batch.gl_prim_type, batch.size(), batch.gl_index_type, data_ptr);
@@ -78,6 +60,9 @@ void OpenGLCommands::draw(const Batch &batch)
 
 void OpenGLCommands::draw_instanced(const Batch &batch, unsigned count)
 {
+	if(!pipeline_state)
+		throw invalid_operation("OpenGLCommands::draw_instanced");
+
 	static Require req(ARB_draw_instanced);
 
 	pipeline_state->apply();
@@ -87,9 +72,11 @@ void OpenGLCommands::draw_instanced(const Batch &batch, unsigned count)
 
 void OpenGLCommands::resolve_multisample(Framebuffer &target)
 {
-	static Require _req(EXT_framebuffer_blit);
+	const Framebuffer *source = (pipeline_state ? pipeline_state->get_framebuffer() : 0);
+	if(!source)
+		throw invalid_operation("OpenGLCommands::draw");
 
-	const Framebuffer *source = pipeline_state->get_framebuffer();
+	static Require _req(EXT_framebuffer_blit);
 
 	unsigned width = min(source->get_width(), target.get_width());
 	unsigned height = min(source->get_height(), target.get_height());