Merge branch 'ogl-tex2d'

Conflicts:
	Source/Core/VideoBackends/OGL/Src/TextureConverter.cpp

Source/Core/VideoBackends/OGL/Src/FramebufferManager.cpp

@@ -33,8 +33,6 @@ GLuint FramebufferManager::m_resolvedDepthTexture;
 GLuint FramebufferManager::m_xfbFramebuffer;
 
 // reinterpret pixel format
-GLuint FramebufferManager::m_pixel_format_vao;
-GLuint FramebufferManager::m_pixel_format_vbo;
 SHADER FramebufferManager::m_pixel_format_shaders[2];
 
 
@@ -79,24 +77,24 @@ FramebufferManager::FramebufferManager(int targetWidth, int targetHeight, int ms
 		m_efbDepth = glObj[1];
 		m_resolvedColorTexture = glObj[2]; // needed for pixel format convertion
 
-		glBindTexture(getFbType(), m_efbColor);
-		glTexParameteri(getFbType(), GL_TEXTURE_MAX_LEVEL, 0);
-		glTexImage2D(getFbType(), 0, GL_RGBA, m_targetWidth, m_targetHeight, 0, GL_RGBA, GL_UNSIGNED_BYTE, NULL);
+		glBindTexture(GL_TEXTURE_2D, m_efbColor);
+		glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAX_LEVEL, 0);
+		glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA, m_targetWidth, m_targetHeight, 0, GL_RGBA, GL_UNSIGNED_BYTE, NULL);
 
-		glBindTexture(getFbType(), m_efbDepth);
-		glTexParameteri(getFbType(), GL_TEXTURE_MAX_LEVEL, 0);
-		glTexImage2D(getFbType(), 0, GL_DEPTH_COMPONENT24, m_targetWidth, m_targetHeight, 0, GL_DEPTH_COMPONENT, GL_UNSIGNED_INT, NULL);
+		glBindTexture(GL_TEXTURE_2D, m_efbDepth);
+		glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAX_LEVEL, 0);
+		glTexImage2D(GL_TEXTURE_2D, 0, GL_DEPTH_COMPONENT24, m_targetWidth, m_targetHeight, 0, GL_DEPTH_COMPONENT, GL_UNSIGNED_INT, NULL);
 
-		glBindTexture(getFbType(), m_resolvedColorTexture);
-		glTexParameteri(getFbType(), GL_TEXTURE_MAX_LEVEL, 0);
-		glTexImage2D(getFbType(), 0, GL_RGBA, m_targetWidth, m_targetHeight, 0, GL_RGBA, GL_UNSIGNED_BYTE, NULL);
+		glBindTexture(GL_TEXTURE_2D, m_resolvedColorTexture);
+		glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAX_LEVEL, 0);
+		glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA, m_targetWidth, m_targetHeight, 0, GL_RGBA, GL_UNSIGNED_BYTE, NULL);
 
 		// Bind target textures to the EFB framebuffer.
 
 		glBindFramebuffer(GL_FRAMEBUFFER, m_efbFramebuffer);
 
-		glFramebufferTexture2D(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, getFbType(), m_efbColor, 0);
-		glFramebufferTexture2D(GL_FRAMEBUFFER, GL_DEPTH_ATTACHMENT, getFbType(), m_efbDepth, 0);
+		glFramebufferTexture2D(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, GL_TEXTURE_2D, m_efbColor, 0);
+		glFramebufferTexture2D(GL_FRAMEBUFFER, GL_DEPTH_ATTACHMENT, GL_TEXTURE_2D, m_efbDepth, 0);
 
 		GL_REPORT_FBO_ERROR();
 	}
@@ -144,20 +142,20 @@ FramebufferManager::FramebufferManager(int targetWidth, int targetHeight, int ms
 		m_resolvedColorTexture = glObj[0];
 		m_resolvedDepthTexture = glObj[1];
 
-		glBindTexture(getFbType(), m_resolvedColorTexture);
-		glTexParameteri(getFbType(), GL_TEXTURE_MAX_LEVEL, 0);
-		glTexImage2D(getFbType(), 0, GL_RGBA, m_targetWidth, m_targetHeight, 0, GL_RGBA, GL_UNSIGNED_BYTE, NULL);
+		glBindTexture(GL_TEXTURE_2D, m_resolvedColorTexture);
+		glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAX_LEVEL, 0);
+		glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA, m_targetWidth, m_targetHeight, 0, GL_RGBA, GL_UNSIGNED_BYTE, NULL);
 
-		glBindTexture(getFbType(), m_resolvedDepthTexture);
-		glTexParameteri(getFbType(), GL_TEXTURE_MAX_LEVEL, 0);
-		glTexImage2D(getFbType(), 0, GL_DEPTH_COMPONENT24, m_targetWidth, m_targetHeight, 0, GL_DEPTH_COMPONENT, GL_UNSIGNED_INT, NULL);
+		glBindTexture(GL_TEXTURE_2D, m_resolvedDepthTexture);
+		glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAX_LEVEL, 0);
+		glTexImage2D(GL_TEXTURE_2D, 0, GL_DEPTH_COMPONENT24, m_targetWidth, m_targetHeight, 0, GL_DEPTH_COMPONENT, GL_UNSIGNED_INT, NULL);
 
 		// Bind resolved textures to resolved framebuffer.
 
 		glBindFramebuffer(GL_FRAMEBUFFER, m_resolvedFramebuffer);
 
-		glFramebufferTexture2D(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, getFbType(), m_resolvedColorTexture, 0);
-		glFramebufferTexture2D(GL_FRAMEBUFFER, GL_DEPTH_ATTACHMENT, getFbType(), m_resolvedDepthTexture, 0);
+		glFramebufferTexture2D(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, GL_TEXTURE_2D, m_resolvedColorTexture, 0);
+		glFramebufferTexture2D(GL_FRAMEBUFFER, GL_DEPTH_ATTACHMENT, GL_TEXTURE_2D, m_resolvedDepthTexture, 0);
 
 		GL_REPORT_FBO_ERROR();
 
@@ -177,33 +175,18 @@ FramebufferManager::FramebufferManager(int targetWidth, int targetHeight, int ms
 	glClear(GL_COLOR_BUFFER_BIT|GL_DEPTH_BUFFER_BIT);
 
 	// reinterpret pixel format
-	glGenBuffers(1, &m_pixel_format_vbo);
-	glGenVertexArrays(1, &m_pixel_format_vao);
-	glBindVertexArray(m_pixel_format_vao);
-	glBindBuffer(GL_ARRAY_BUFFER, m_pixel_format_vbo);
-	glEnableVertexAttribArray(SHADER_POSITION_ATTRIB);
-	glVertexAttribPointer(SHADER_POSITION_ATTRIB, 2, GL_FLOAT, 0, sizeof(GLfloat)*2, NULL);
-
-	float vertices[] = {
-		-1.0,	-1.0,
-		1.0,	-1.0,
-		-1.0,	1.0,
-		1.0,	1.0,
-	};
-	glBufferData(GL_ARRAY_BUFFER, sizeof(vertices), vertices, GL_STATIC_DRAW);
-
 	char vs[] =
-		"ATTRIN vec2 rawpos;\n"
 		"void main(void) {\n"
-		"	gl_Position = vec4(rawpos,0,1);\n"
+		"	vec2 rawpos = vec2(gl_VertexID&1, gl_VertexID&2);\n"
+		"	gl_Position = vec4(rawpos*2.0-1.0, 0.0, 1.0);\n"
 		"}\n";
 
 	char ps_rgba6_to_rgb8[] =
-		"uniform sampler2DRect samp9;\n"
+		"uniform sampler2D samp9;\n"
 		"out vec4 ocol0;\n"
 		"void main()\n"
 		"{\n"
-		"	ivec4 src6 = ivec4(round(texture2DRect(samp9, gl_FragCoord.xy) * 63.f));\n"
+		"	ivec4 src6 = ivec4(round(texelFetch(samp9, ivec2(gl_FragCoord.xy), 0) * 63.f));\n"
 		"	ivec4 dst8;\n"
 		"	dst8.r = (src6.r << 2) | (src6.g >> 4);\n"
 		"	dst8.g = ((src6.g & 0xF) << 4) | (src6.b >> 2);\n"
@@ -213,11 +196,11 @@ FramebufferManager::FramebufferManager(int targetWidth, int targetHeight, int ms
 		"}";
 
 	char ps_rgb8_to_rgba6[] =
-		"uniform sampler2DRect samp9;\n"
+		"uniform sampler2D samp9;\n"
 		"out vec4 ocol0;\n"
 		"void main()\n"
 		"{\n"
-		"	ivec4 src8 = ivec4(round(texture2DRect(samp9, gl_FragCoord.xy) * 255.f));\n"
+		"	ivec4 src8 = ivec4(round(texelFetch(samp9, ivec2(gl_FragCoord.xy), 0) * 255.f));\n"
 		"	ivec4 dst6;\n"
 		"	dst6.r = src8.r >> 2;\n"
 		"	dst6.g = ((src8.r & 0x3) << 4) | (src8.g >> 4);\n"
@@ -261,8 +244,6 @@ FramebufferManager::~FramebufferManager()
 	m_efbDepth = 0;
 
 	// reinterpret pixel format
-	glDeleteVertexArrays(1, &m_pixel_format_vao);
-	glDeleteBuffers(1, &m_pixel_format_vbo);
 	m_pixel_format_shaders[0].Destroy();
 	m_pixel_format_shaders[1].Destroy();
 }
@@ -386,14 +367,13 @@ void FramebufferManager::ReinterpretPixelData(unsigned int convtype)
 		m_resolvedColorTexture = src_texture;
 
 		// also switch them on fbo
-		glFramebufferTexture2D(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, getFbType(), m_efbColor, 0);
+		glFramebufferTexture2D(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, GL_TEXTURE_2D, m_efbColor, 0);
 	}
 	glViewport(0,0, m_targetWidth, m_targetHeight);
 	glActiveTexture(GL_TEXTURE0 + 9);
-	glBindTexture(getFbType(), src_texture);
+	glBindTexture(GL_TEXTURE_2D, src_texture);
 
 	m_pixel_format_shaders[convtype ? 1 : 0].Bind();
-	glBindVertexArray(m_pixel_format_vao);
 	glDrawArrays(GL_TRIANGLE_STRIP, 0, 4);
 
 	g_renderer->RestoreAPIState();

Source/Core/VideoBackends/OGL/Src/FramebufferManager.h

@@ -57,14 +57,6 @@ struct XFBSource : public XFBSourceBase
 	const GLuint texture;
 };
 
-inline GLenum getFbType()
-{
-#ifndef USE_GLES3
-	return GL_TEXTURE_RECTANGLE;
-#endif
-	return GL_TEXTURE_2D;
-}
-
 class FramebufferManager : public FramebufferManagerBase
 {
 public:
@@ -121,8 +113,6 @@ class FramebufferManager : public FramebufferManagerBase
 	static GLuint m_xfbFramebuffer; // Only used in MSAA mode
 
 	// For pixel format draw
-	static GLuint m_pixel_format_vbo;
-	static GLuint m_pixel_format_vao;
 	static SHADER m_pixel_format_shaders[2];
 };
 

Source/Core/VideoBackends/OGL/Src/PostProcessing.cpp

@@ -25,18 +25,15 @@ static u32 s_width;
 static u32 s_height;
 static GLuint s_fbo;
 static GLuint s_texture;
-static GLuint s_vao;
-static GLuint s_vbo;
 
 static GLuint s_uniform_resolution;
 
 static char s_vertex_shader[] =
-	"in vec2 rawpos;\n"
-	"in vec2 tex0;\n"
 	"out vec2 uv0;\n"
 	"void main(void) {\n"
-	"	gl_Position = vec4(rawpos,0,1);\n"
-	"	uv0 = tex0;\n"
+	"	vec2 rawpos = vec2(gl_VertexID&1, gl_VertexID&2);\n"
+	"	gl_Position = vec4(rawpos*2.0-1.0, 0.0, 1.0);\n"
+	"	uv0 = rawpos;\n"
 	"}\n";
 
 void Init()
@@ -56,34 +53,14 @@ void Init()
 	glBindFramebuffer(GL_FRAMEBUFFER, s_fbo);
 	glFramebufferTexture2D(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, GL_TEXTURE_2D, s_texture, 0);
 	FramebufferManager::SetFramebuffer(0);
-
-	glGenBuffers(1, &s_vbo);
-	glBindBuffer(GL_ARRAY_BUFFER, s_vbo);
-	GLfloat vertices[] = {
-		-1.f, -1.f, 0.f, 0.f,
-		-1.f,  1.f, 0.f, 1.f,
-		 1.f, -1.f, 1.f, 0.f,
-		 1.f,  1.f, 1.f, 1.f
-	};
-	glBufferData(GL_ARRAY_BUFFER, sizeof(vertices), vertices, GL_STATIC_DRAW);
-
-	glGenVertexArrays(1, &s_vao);
-	glBindVertexArray( s_vao );
-	glEnableVertexAttribArray(SHADER_POSITION_ATTRIB);
-	glVertexAttribPointer(SHADER_POSITION_ATTRIB, 2, GL_FLOAT, 0, sizeof(GLfloat)*4, NULL);
-	glEnableVertexAttribArray(SHADER_TEXTURE0_ATTRIB);
-	glVertexAttribPointer(SHADER_TEXTURE0_ATTRIB, 2, GL_FLOAT, 0, sizeof(GLfloat)*4, (GLfloat*)NULL+2);
 }
 
 void Shutdown()
 {
 	s_shader.Destroy();
 
-	glDeleteFramebuffers(1, &s_vbo);
+	glDeleteFramebuffers(1, &s_fbo);
 	glDeleteTextures(1, &s_texture);
-
-	glDeleteBuffers(1, &s_vbo);
-	glDeleteVertexArrays(1, &s_vao);
 }
 
 void ReloadShader()
@@ -103,15 +80,13 @@ void BlitToScreen()
 	glBindFramebuffer(GL_DRAW_FRAMEBUFFER, 0);
 	glViewport(0, 0, s_width, s_height);
 
-	glBindVertexArray(s_vao);
 	s_shader.Bind();
 
 	glUniform4f(s_uniform_resolution, (float)s_width, (float)s_height, 1.0f/(float)s_width, 1.0f/(float)s_height);
 
 	glActiveTexture(GL_TEXTURE0+9);
 	glBindTexture(GL_TEXTURE_2D, s_texture);
 	glDrawArrays(GL_TRIANGLE_STRIP, 0, 4);
-	glBindTexture(GL_TEXTURE_2D, 0);
 
 /*	glBindFramebuffer(GL_READ_FRAMEBUFFER, s_fbo);
 
@@ -132,7 +107,6 @@ void Update ( u32 width, u32 height )
 		glActiveTexture(GL_TEXTURE0+9);
 		glBindTexture(GL_TEXTURE_2D, s_texture);
 		glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA, width, height, 0, GL_RGBA, GL_UNSIGNED_BYTE, NULL);
-		glBindTexture(GL_TEXTURE_2D, 0);
 	}
 }
 

Source/Core/VideoBackends/OGL/Src/ProgramShaderCache.cpp

@@ -584,16 +584,14 @@ void ProgramShaderCache::CreateHeader ( void )
 		"#define float2 vec2\n"
 		"#define float3 vec3\n"
 		"#define float4 vec4\n"
+		"#define int2 ivec2\n"
+		"#define int3 ivec3\n"
+		"#define int4 ivec4\n"
 
 		// hlsl to glsl function translation
 		"#define frac fract\n"
 		"#define lerp mix\n"
 
-		// texture2d hack
-		"%s\n"
-		"%s\n"
-		"%s\n"
-
 		, v==GLSLES3 ? "#version 300 es" : v==GLSL_130 ? "#version 130" : v==GLSL_140 ? "#version 140" : "#version 150"
 		, g_ActiveConfig.backend_info.bSupportsGLSLUBO && v<GLSL_140 ? "#extension GL_ARB_uniform_buffer_object : enable" : ""
 		, g_ActiveConfig.backend_info.bSupportsEarlyZ ? "#extension GL_ARB_shader_image_load_store : enable" : ""
@@ -602,10 +600,6 @@ void ProgramShaderCache::CreateHeader ( void )
 
 		, DriverDetails::HasBug(DriverDetails::BUG_BROKENCENTROID) ? "in" : "centroid in"
 		, DriverDetails::HasBug(DriverDetails::BUG_BROKENCENTROID) ? "out" : "centroid out"
-
-		, v==GLSLES3 ? "" : v<=GLSL_130 ? "#extension GL_ARB_texture_rectangle : enable" : "#define texture2DRect texture"
-		, v==GLSLES3 ? "#define texture2DRect(samp, uv)  texelFetch(samp, ivec2(floor(uv)), 0)" : ""
-		, v==GLSLES3 ? "#define sampler2DRect sampler2D" : ""
 	);
 }