Depth Peeling. Day 384.

Author: itfrombit

README.md

@@ -3,7 +3,7 @@ osx_handmade
 
 A port of Handmade Hero (http://handmadehero.org) for OS X.
 
-This repository works with Casey's source code from handmade_hero_day_380.
+This repository works with Casey's source code from handmade_hero_day_384.
 
 
 2017-04-01 Note:
@@ -17,8 +17,8 @@ apply the patch by running:
 This patches a problem in handmade_opengl.cpp. Mac OS X supports an OpenGL 3.2
 core profile, but not an OpenGL 3.0 core profile. The OpenGL C code works okay
 as-is, but the Handmde Hero GLSL shader language is set to 1.3, which Mac OS X
-refuses to compile. For now, simply changing the GLSL version to 1.5 fixes the
-issue.
+refuses to compile under an OpenGL 3.2 core profile. For now, simply changing
+the GLSL version to 1.5 fixes the issue.
 
 
 Compiling and Running

code/osx_handmade.cpp

@@ -64,6 +64,9 @@ typedef void gl_get_program_iv(GLuint program, GLenum pname, GLint *params);
 typedef void type_glBindVertexArray(GLuint array);
 typedef void type_glGenVertexArrays(GLsizei n, GLuint *arrays);
 typedef GLubyte* type_glGetStringi(GLenum name, GLuint index);
+typedef GLubyte* type_glGetStringi(GLenum name, GLuint index);
+
+typedef void type_glDeleteFramebuffers(GLsizei n, const GLuint* framebuffers);
 
 global_variable gl_tex_image_2d_multisample *glTexImage2DMultisample;
 global_variable gl_bind_framebuffer* glBindFramebuffer;
@@ -96,6 +99,7 @@ global_variable gl_get_program_iv *glGetProgramiv;
 
 OpenGLGlobalFunction(glBindVertexArray);
 OpenGLGlobalFunction(glGenVertexArrays);
+OpenGLGlobalFunction(glDeleteFramebuffers);
 
 
 //#include "handmade_intrinsics.h"

code/osx_handmade.h

@@ -258,9 +258,6 @@ void OSXCompleteAllWork(platform_work_queue *Queue);
 
 typedef struct osx_game_data
 {
-	// graphics
-	uint						TextureId;
-
 	// input
 	IOHIDManagerRef				HIDManager;
 	int							HIDX;

code/osx_handmade_game.cpp

@@ -144,6 +144,7 @@ void OSXSetupOpenGL(osx_game_data* GameData)
         glTexImage2DMultisample = (gl_tex_image_2d_multisample *)dlsym(Image, "glTexImage2DMultisample");
         glBlitFramebuffer = (gl_blit_framebuffer *)dlsym(Image, "glBlitFramebuffer");
 
+		OSXGetOpenGLFunction(Image, glDeleteFramebuffers);
 #if 0
         glAttachShader = (gl_attach_shader *)dlsym("glAttachShader");
         glCompileShader = (gl_compile_shader *)dlsym("glCompileShader");
@@ -185,13 +186,14 @@ void OSXSetupOpenGL(osx_game_data* GameData)
         Assert(glValidateProgram);
         Assert(glGetProgramiv);
 
+		//OpenGL.SupportsSRGBFramebuffer = true;
 		OpenGLInit(Info, OpenGL.SupportsSRGBFramebuffer);
 
-		glGenTextures(1, &GameData->TextureId);
-
-		//OpenGLDefaultInternalTextureFormat = GL_RGBA8;
+#if 0
+		OpenGLDefaultInternalTextureFormat = GL_RGBA8;
 		//OpenGLDefaultInternalTextureFormat = GL_SRGB8_ALPHA8;
-		//glEnable(GL_FRAMEBUFFER_SRGB);
+		glEnable(GL_FRAMEBUFFER_SRGB);
+#endif
 	}
 	else
 	{
@@ -548,8 +550,7 @@ void OSXDisplayBufferInWindow(platform_work_queue* RenderQueue,
 							  rectangle2i DrawRegion,
 							  u32 WindowWidth,
 							  u32 WindowHeight,
-						      memory_arena* TempArena,
-						      GLuint TextureId)
+						      memory_arena* TempArena)
 {
 	temporary_memory TempMem = BeginTemporaryMemory(TempArena);
 
@@ -611,7 +612,7 @@ void OSXProcessFrameAndRunGameLogic(osx_game_data* GameData, CGRect WindowFrame,
 
 	BEGIN_BLOCK("Input Processing");
 
-	game_render_commands RenderCommands = RenderCommandStruct(
+	game_render_commands RenderCommands = DefaultRenderCommands(
 											GameData->PushBufferSize,
 											GameData->PushBuffer,
 											(u32)GameData->RenderBuffer.Width,
@@ -621,7 +622,7 @@ void OSXProcessFrameAndRunGameLogic(osx_game_data* GameData, CGRect WindowFrame,
 											GameData->BitmapArray,
 											&OpenGL.WhiteBitmap);
 
-	rectangle2i DrawRegion = AspectRatioFit(RenderCommands.Width, RenderCommands.Height,
+	rectangle2i DrawRegion = AspectRatioFit(RenderCommands.Settings.Width, RenderCommands.Settings.Height,
 											WindowFrame.size.width, WindowFrame.size.height);
 
 	game_controller_input* OldKeyboardController = GetController(GameData->OldInput, 0);
@@ -657,8 +658,8 @@ void OSXProcessFrameAndRunGameLogic(osx_game_data* GameData, CGRect WindowFrame,
 		r32 MouseX = (r32)MouseLocation.x;
 		r32 MouseY = (r32)MouseLocation.y;
 
-		GameData->NewInput->MouseX = RenderCommands.Width * Clamp01MapToRange(DrawRegion.MinX, MouseX, DrawRegion.MaxX);
-		GameData->NewInput->MouseY = RenderCommands.Height * Clamp01MapToRange(DrawRegion.MinY, MouseY, DrawRegion.MaxY);
+		GameData->NewInput->MouseX = RenderCommands.Settings.Width * Clamp01MapToRange(DrawRegion.MinX, MouseX, DrawRegion.MaxX);
+		GameData->NewInput->MouseY = RenderCommands.Settings.Height * Clamp01MapToRange(DrawRegion.MinY, MouseY, DrawRegion.MaxY);
 
 
 		GameData->NewInput->MouseZ = 0; // TODO(casey): Support mousewheel?
@@ -934,8 +935,10 @@ void OSXProcessFrameAndRunGameLogic(osx_game_data* GameData, CGRect WindowFrame,
 							 DrawRegion,
 							 WindowFrame.size.width,
 							 WindowFrame.size.height,
-							 &FrameTempArena,
-							 GameData->TextureId);
+							 &FrameTempArena);
+
+	RenderCommands.PushBufferDataAt = RenderCommands.PushBufferBase;
+	RenderCommands.VertexCount = 0;
 
 	END_BLOCK();
 }

fix_handmade_hero_source.sh

@@ -1,4 +1,4 @@
 #!/bin/sh
 
-patch cpp/code/handmade_opengl.cpp -i handmade_opengl.cpp.day380.patch
+patch cpp/code/handmade_opengl.cpp -i handmade_opengl.cpp.day384.patch
 

handmade_opengl.cpp.day384.patch

@@ -0,0 +1,29 @@
+--- cpp/code/handmade_opengl.cpp	2017-05-09 12:41:47.000000000 -0400
++++ handmade_opengl.cpp	2017-05-09 12:42:19.000000000 -0400
+@@ -608,7 +608,7 @@
+ {
+     char Defines[1024];
+     FormatString(sizeof(Defines), Defines,
+-                 "#version 130\n"
++                 "#version 150\n"
+                  "#define ShaderSimTexWriteSRGB %d\n"
+                  "#define ShaderSimTexReadSRGB %d\n"
+                  "#define DepthPeel %d\n",
+@@ -728,7 +728,7 @@
+ {
+     char Defines[1024];
+     FormatString(sizeof(Defines), Defines,
+-                 "#version 130\n"
++                 "#version 150\n"
+                  "#define ShaderSimTexWriteSRGB %d\n"
+                  "#define ShaderSimTexReadSRGB %d\n"
+                  "#define DepthPeel %d\n",
+@@ -813,7 +813,7 @@
+ {
+     char Defines[1024];
+     FormatString(sizeof(Defines), Defines,
+-                 "#version 130\n"
++                 "#version 150\n"
+                  "#define ShaderSimTexWriteSRGB %d\n"
+                  "#define ShaderSimTexReadSRGB %d\n",
+                  OpenGL.ShaderSimTexWriteSRGB,