X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;ds=sidebyside;f=source%2Fcore%2Fcommands.cpp;h=2eb4659ad8e6ae0f62ecb2ec2e9aed362dc6afc3;hb=006bdb4f8660098fc524dcca80b24c943c65b249;hp=72b5a939f7194bb95280c9c4e3fbad9fd1b5caf8;hpb=ebef7085e2672866189ccdb3a89e977e678a89b9;p=libs%2Fgl.git

diff --git a/source/core/commands.cpp b/source/core/commands.cpp
index 72b5a939..2eb4659a 100644
--- a/source/core/commands.cpp
+++ b/source/core/commands.cpp
@@ -3,8 +3,10 @@
 #include <msp/gl/extensions/arb_draw_instanced.h>
 #include <msp/gl/extensions/ext_framebuffer_blit.h>
 #include <msp/gl/extensions/ext_framebuffer_object.h>
+#include <msp/gl/extensions/msp_clear_buffer.h>
 #include "batch.h"
 #include "commands.h"
+#include "error.h"
 #include "gl.h"
 #include "pipelinestate.h"
 
@@ -22,17 +24,51 @@ void Commands::use_pipeline(const PipelineState &ps)
 	pipeline_state = &ps;
 }
 
-void Commands::clear(BufferBits buffers)
+void Commands::clear(const ClearValue *values)
 {
-	pipeline_state->apply();
-	glClear(buffers);
+	const Framebuffer *target = pipeline_state->get_framebuffer();
+	if(!target)
+		throw invalid_operation("OpenGLCommands::clear");
+
+	if(!ARB_direct_state_access)
+	{
+		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);
+		}
+		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);
+		}
+		else
+		{
+			if(ARB_direct_state_access)
+				glClearNamedFramebufferfv(target->id, GL_COLOR, i++, &values->color.r);
+			else
+				glClearBufferfv(GL_COLOR, i++, &values->color.r);
+		}
+		++values;
+	}
 }
 
 void Commands::draw(const Batch &batch)
 {
 	pipeline_state->apply();
 	void *data_ptr = reinterpret_cast<void *>(batch.get_offset());
-	glDrawElements(batch.get_type(), batch.size(), batch.get_gl_index_type(), data_ptr);
+	glDrawElements(batch.get_gl_primitive_type(), batch.size(), batch.get_gl_index_type(), data_ptr);
 }
 
 void Commands::draw_instanced(const Batch &batch, unsigned count)
@@ -41,28 +77,30 @@ void Commands::draw_instanced(const Batch &batch, unsigned count)
 
 	pipeline_state->apply();
 	void *data_ptr = reinterpret_cast<void *>(batch.get_offset());
-	glDrawElementsInstanced(batch.get_type(), batch.size(), batch.get_gl_index_type(), data_ptr, count);
+	glDrawElementsInstanced(batch.get_gl_primitive_type(), batch.size(), batch.get_gl_index_type(), data_ptr, count);
 }
 
 void Commands::resolve_multisample(Framebuffer &target, BufferBits buffers)
 {
+	static Require _req(EXT_framebuffer_blit);
+
 	const Framebuffer *source = pipeline_state->get_framebuffer();
 
 	unsigned width = min(source->get_width(), target.get_width());
 	unsigned height = min(source->get_height(), target.get_height());
 
 	if(ARB_direct_state_access)
-		glBlitNamedFramebuffer(source->get_id(), target.get_id(), 0, 0, width, height, 0, 0, width, height, buffers, GL_NEAREST);
+		glBlitNamedFramebuffer(source->id, target.id, 0, 0, width, height, 0, 0, width, height, buffers, GL_NEAREST);
 	else
 	{
-		glBindFramebuffer(GL_READ_FRAMEBUFFER, source->get_id());
-		glBindFramebuffer(GL_DRAW_FRAMEBUFFER, target.get_id());
+		glBindFramebuffer(GL_READ_FRAMEBUFFER, source->id);
+		glBindFramebuffer(GL_DRAW_FRAMEBUFFER, target.id);
 
 		target.refresh();
 
 		glBlitFramebuffer(0, 0, width, height, 0, 0, width, height, buffers, GL_NEAREST);
 
-		glBindFramebuffer(GL_FRAMEBUFFER, source->get_id());
+		glBindFramebuffer(GL_FRAMEBUFFER, source->id);
 	}
 }