Merge pull request #72 from cortex-command-community/gl3.0

Gl3.0

Author: Causeless

Data/Base.rte/Shaders/Blit8.frag

@@ -1,5 +1,5 @@
 // Blit8.frag
-#version 330 core
+#version 130
 
 in vec2 textureUV;
 

Data/Base.rte/Shaders/Blit8.vert

@@ -1,7 +1,7 @@
-#version 330 core
+#version 130
 
-layout(location = 0) in vec2 rteVertexPosition;
-layout(location = 1) in vec2 rteTexUV;
+in vec2 rteVertexPosition;
+in vec2 rteTexUV;
 
 out vec2 textureUV;
 

Data/Base.rte/Shaders/PostProcess.frag

@@ -1,4 +1,4 @@
-#version 330 core
+#version 130
 
 in vec2 textureUV;
 

Data/Base.rte/Shaders/PostProcess.vert

@@ -1,7 +1,7 @@
-#version 330 core
+#version 130
 
-layout(location = 0) in vec2 rteVertexPosition;
-layout(location = 1) in vec2 rteTexUV;
+in vec2 rteVertexPosition;
+in vec2 rteTexUV;
 
 out vec2 textureUV;
 

Data/Base.rte/Shaders/ScreenBlit.frag

@@ -1,4 +1,4 @@
-#version 330 core
+#version 130
 
 in vec2 textureUV;
 

Data/Base.rte/Shaders/ScreenBlit.vert

@@ -1,7 +1,7 @@
-#version 330 core
+#version 130
 
-layout(location = 0) in vec2 rteVertexPosition;
-layout(location = 1) in vec2 rteTexUV;
+in vec2 rteVertexPosition;
+in vec2 rteTexUV;
 
 out vec2 textureUV;
 

Source/Managers/WindowMan.cpp

@@ -15,7 +15,6 @@
 #include "glm/gtc/matrix_transform.hpp"
 #include "glm/gtc/epsilon.hpp"
 #include "tracy/Tracy.hpp"
-#include "tracy/TracyOpenGL.hpp"
 
 #ifdef __linux__
 #include "Resources/cccp.xpm"
@@ -99,8 +98,8 @@ void WindowMan::Initialize() {
 
 	SDL_GL_SetAttribute(SDL_GL_DOUBLEBUFFER, 1);
 	SDL_GL_SetAttribute(SDL_GL_CONTEXT_MAJOR_VERSION, 3);
-	SDL_GL_SetAttribute(SDL_GL_CONTEXT_MINOR_VERSION, 3);
-	SDL_GL_SetAttribute(SDL_GL_CONTEXT_PROFILE_MASK, SDL_GL_CONTEXT_PROFILE_CORE);
+	SDL_GL_SetAttribute(SDL_GL_CONTEXT_MINOR_VERSION, 0);
+	SDL_GL_SetAttribute(SDL_GL_CONTEXT_PROFILE_MASK, SDL_GL_CONTEXT_PROFILE_COMPATIBILITY);
 	CreatePrimaryWindow();
 	InitializeOpenGL();
 	CreateBackBufferTexture();
@@ -206,7 +205,6 @@ void WindowMan::InitializeOpenGL() {
 	GL_CHECK(glGenTextures(1, &m_BackBuffer32Texture));
 	GL_CHECK(glGenTextures(1, &m_ScreenBufferTexture));
 	GL_CHECK(glGenFramebuffers(1, &m_ScreenBufferFBO));
-	TracyGpuContext;
 }
 
 void WindowMan::CreateBackBufferTexture() {
@@ -697,7 +695,6 @@ void WindowMan::ClearRenderer(bool clearFrameMan) {
 }
 
 void WindowMan::UploadFrame() {
-	TracyGpuZone("Upload Frame");
 	GL_CHECK(glDisable(GL_DEPTH_TEST));
 
 	GL_CHECK(glBindFramebuffer(GL_FRAMEBUFFER, m_ScreenBufferFBO));
@@ -709,22 +706,19 @@ void WindowMan::UploadFrame() {
 
 	GL_CHECK(glEnable(GL_BLEND));
 	if (m_DrawPostProcessBuffer) {
-		TracyGpuZone("Upload Post Process Buffer");
 		GL_CHECK(glBindTexture(GL_TEXTURE_2D, g_PostProcessMan.GetPostProcessColorBuffer()));
 		GL_CHECK(glActiveTexture(GL_TEXTURE1));
 		GL_CHECK(glBindTexture(GL_TEXTURE_2D, m_BackBuffer32Texture));
 		GL_CHECK(glPixelStorei(GL_UNPACK_ALIGNMENT, 4));
 		GL_CHECK(glTexSubImage2D(GL_TEXTURE_2D, 0, 0, 0, g_FrameMan.GetBackBuffer32()->w, g_FrameMan.GetBackBuffer32()->h, GL_RGBA, GL_UNSIGNED_BYTE, g_FrameMan.GetBackBuffer32()->line[0]));
 	} else {
-		TracyGpuZone("Upload no Post Process Buffer");
 		GL_CHECK(glBindTexture(GL_TEXTURE_2D, 0));
 		GL_CHECK(glActiveTexture(GL_TEXTURE1));
 		GL_CHECK(glBindTexture(GL_TEXTURE_2D, m_BackBuffer32Texture));
 		GL_CHECK(glPixelStorei(GL_UNPACK_ALIGNMENT, 4));
 		GL_CHECK(glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA, g_FrameMan.GetBackBuffer32()->w, g_FrameMan.GetBackBuffer32()->h, 0, GL_RGBA, GL_UNSIGNED_BYTE, g_FrameMan.GetBackBuffer32()->line[0]));
 	}
 	{
-		TracyGpuZone("Setup Draw Screen");
 		GL_CHECK(glBindVertexArray(m_ScreenVAO));
 		m_ScreenBlitShader->Use();
 		m_ScreenBlitShader->SetInt(m_ScreenBlitShader->GetTextureUniform(), 0);
@@ -739,13 +733,11 @@ void WindowMan::UploadFrame() {
 		GL_CHECK(glBindTexture(GL_TEXTURE_2D, m_ScreenBufferTexture));
 	}
 	if (m_MultiDisplayWindows.empty()) {
-		TracyGpuZone("Swap Window");
 		GL_CHECK(glViewport(m_PrimaryWindowViewport->x, m_PrimaryWindowViewport->y, m_PrimaryWindowViewport->w, m_PrimaryWindowViewport->h));
 		m_ScreenBlitShader->SetMatrix4f(m_ScreenBlitShader->GetTransformUniform(), glm::mat4(1.0f));
 		GL_CHECK(glDrawArrays(GL_TRIANGLE_STRIP, 0, 4));
 		SDL_GL_SwapWindow(m_PrimaryWindow.get());
 	} else {
-		TracyGpuZone("Swap Multi Display");
 		for (size_t i = 0; i < m_MultiDisplayWindows.size(); ++i) {
 			SDL_GL_MakeCurrent(m_MultiDisplayWindows.at(i).get(), m_GLContext.get());
 			int windowW, windowH;
@@ -757,6 +749,5 @@ void WindowMan::UploadFrame() {
 			SDL_GL_SwapWindow(m_MultiDisplayWindows.at(i).get());
 		}
 	}
-	TracyGpuCollect;
 	FrameMark;
 }