ShuriZma
/
pcsx2
mirror of https://github.com/PCSX2/pcsx2.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

gsdx ogl: GL_ARB_direct_state_access is now mandatory

This commit is contained in:
Gregory Hainaut 2016-04-07 22:24:12 +02:00
parent a62019a3fd
commit cef76de547
3 changed files with 26 additions and 220 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

182
plugins/GSdx/GLLoader.cpp
View File

@ -22,7 +22,6 @@
#include "GLLoader.h" #include "GLLoader.h"
#include "GSdx.h" #include "GSdx.h"
PFNGLACTIVETEXTUREPROC gl_ActiveTexture = NULL;
PFNGLBLENDCOLORPROC gl_BlendColor = NULL; PFNGLBLENDCOLORPROC gl_BlendColor = NULL;
PFNGLATTACHSHADERPROC glAttachShader = NULL; PFNGLATTACHSHADERPROC glAttachShader = NULL;
@ -116,7 +115,6 @@ PFNGLDEBUGMESSAGECONTROLPROC glDebugMessageControl = NUL
// GL4.2 // GL4.2
PFNGLBINDIMAGETEXTUREPROC glBindImageTexture = NULL; PFNGLBINDIMAGETEXTUREPROC glBindImageTexture = NULL;
PFNGLMEMORYBARRIERPROC glMemoryBarrier = NULL; PFNGLMEMORYBARRIERPROC glMemoryBarrier = NULL;
PFNGLTEXSTORAGE2DPROC glTexStorage2D = NULL;
// GL4.4 // GL4.4
PFNGLCLEARTEXIMAGEPROC glClearTexImage = NULL; PFNGLCLEARTEXIMAGEPROC glClearTexImage = NULL;
PFNGLBUFFERSTORAGEPROC glBufferStorage = NULL; PFNGLBUFFERSTORAGEPROC glBufferStorage = NULL;
@ -154,176 +152,6 @@ PFNGLCREATEPROGRAMPIPELINESPROC glCreateProgramPipelines = NUL
PFNGLCLIPCONTROLPROC glClipControl = NULL; PFNGLCLIPCONTROLPROC glClipControl = NULL;
PFNGLTEXTUREBARRIERPROC glTextureBarrier = NULL; PFNGLTEXTUREBARRIERPROC glTextureBarrier = NULL;
namespace Emulate_DSA {
// Texture entry point
void APIENTRY BindTextureUnit(GLuint unit, GLuint texture) {
gl_ActiveTexture(GL_TEXTURE0 + unit);
glBindTexture(GL_TEXTURE_2D, texture);
}
void APIENTRY CreateTexture(GLenum target, GLsizei n, GLuint *textures) {
glGenTextures(1, textures);
}
void APIENTRY TextureStorage(GLuint texture, GLsizei levels, GLenum internalformat, GLsizei width, GLsizei height) {
BindTextureUnit(7, texture);
glTexStorage2D(GL_TEXTURE_2D, levels, internalformat, width, height);
}
void APIENTRY TextureSubImage(GLuint texture, GLint level, GLint xoffset, GLint yoffset, GLsizei width, GLsizei height, GLenum format, GLenum type, const void *pixels) {
BindTextureUnit(7, texture);
glTexSubImage2D(GL_TEXTURE_2D, level, xoffset, yoffset, width, height, format, type, pixels);
}
void APIENTRY CopyTextureSubImage(GLuint texture, GLint level, GLint xoffset, GLint yoffset, GLint x, GLint y, GLsizei width, GLsizei height) {
BindTextureUnit(7, texture);
glCopyTexSubImage2D(GL_TEXTURE_2D, level, xoffset, yoffset, x, y, width, height);
}
void APIENTRY GetTexureImage(GLuint texture, GLint level, GLenum format, GLenum type, GLsizei bufSize, void *pixels) {
BindTextureUnit(7, texture);
glGetTexImage(GL_TEXTURE_2D, level, format, type, pixels);
}
void APIENTRY TextureParameteri (GLuint texture, GLenum pname, GLint param) {
BindTextureUnit(7, texture);
glTexParameteri(GL_TEXTURE_2D, pname, param);
}
// Framebuffer entry point
GLenum fb_target = 0;
void SetFramebufferTarget(GLenum target) {
fb_target = target;
}
void APIENTRY CreateFramebuffers(GLsizei n, GLuint *framebuffers) {
glGenFramebuffers(n, framebuffers);
}
void APIENTRY ClearNamedFramebufferfv(GLuint framebuffer, GLenum buffer, GLint drawbuffer, const GLfloat *value) {
glBindFramebuffer(fb_target, framebuffer);
glClearBufferfv(buffer, drawbuffer, value);
}
void APIENTRY ClearNamedFramebufferiv(GLuint framebuffer, GLenum buffer, GLint drawbuffer, const GLint *value) {
glBindFramebuffer(fb_target, framebuffer);
glClearBufferiv(buffer, drawbuffer, value);
}
void APIENTRY ClearNamedFramebufferuiv(GLuint framebuffer, GLenum buffer, GLint drawbuffer, const GLuint *value) {
glBindFramebuffer(fb_target, framebuffer);
glClearBufferuiv(buffer, drawbuffer, value);
}
void APIENTRY NamedFramebufferTexture(GLuint framebuffer, GLenum attachment, GLuint texture, GLint level) {
glBindFramebuffer(fb_target, framebuffer);
glFramebufferTexture2D(fb_target, attachment, GL_TEXTURE_2D, texture, level);
}
void APIENTRY NamedFramebufferDrawBuffers(GLuint framebuffer, GLsizei n, const GLenum *bufs) {
glBindFramebuffer(fb_target, framebuffer);
glDrawBuffers(n, bufs);
}
void APIENTRY NamedFramebufferReadBuffer(GLuint framebuffer, GLenum src) {
glBindFramebuffer(fb_target, framebuffer);
glReadBuffer(src);
glBindFramebuffer(fb_target, 0);
}
GLenum APIENTRY CheckNamedFramebufferStatus(GLuint framebuffer, GLenum target) {
glBindFramebuffer(fb_target, framebuffer);
return glCheckFramebufferStatus(fb_target);
}
// Buffer entry point
GLenum buffer_target = 0;
void SetBufferTarget(GLenum target) {
buffer_target = target;
}
void APIENTRY CreateBuffers(GLsizei n, GLuint *buffers) {
glGenBuffers(1, buffers);
}
void APIENTRY NamedBufferStorage(GLuint buffer, buffer_proc_t size, const void *data, GLbitfield flags) {
glBindBuffer(buffer_target, buffer);
glBufferStorage(buffer_target, size, data, flags);
}
void APIENTRY NamedBufferData(GLuint buffer, buffer_proc_t size, const void *data, GLenum usage) {
glBindBuffer(buffer_target, buffer);
glBufferData(buffer_target, size, data, usage);
}
void APIENTRY NamedBufferSubData(GLuint buffer, GLintptr offset, buffer_proc_t size, const void *data) {
glBindBuffer(buffer_target, buffer);
glBufferSubData(buffer_target, offset, size, data);
}
void *APIENTRY MapNamedBuffer(GLuint buffer, GLenum access) {
glBindBuffer(buffer_target, buffer);
return glMapBuffer(buffer_target, access);
}
void *APIENTRY MapNamedBufferRange(GLuint buffer, GLintptr offset, buffer_proc_t length, GLbitfield access) {
glBindBuffer(buffer_target, buffer);
return glMapBufferRange(buffer_target, offset, length, access);
}
GLboolean APIENTRY UnmapNamedBuffer(GLuint buffer) {
glBindBuffer(buffer_target, buffer);
return glUnmapBuffer(buffer_target);
}
void APIENTRY FlushMappedNamedBufferRange(GLuint buffer, GLintptr offset, buffer_proc_t length) {
glBindBuffer(buffer_target, buffer);
glFlushMappedBufferRange(buffer_target, offset, length);
}
// Misc entry point
// (only purpose is to have a consistent API otherwise it is useless)
void APIENTRY CreateProgramPipelines(GLsizei n, GLuint *pipelines) {
glGenProgramPipelines(n, pipelines);
}
void APIENTRY CreateSamplers(GLsizei n, GLuint *samplers) {
glGenSamplers(n, samplers);
}
// Replace function pointer to emulate DSA behavior
void Init() {
fprintf(stderr, "DSA is not supported. Replacing the GL function pointer to emulate it\n");
glBindTextureUnit = BindTextureUnit;
glCreateTextures = CreateTexture;
glTextureStorage2D = TextureStorage;
glTextureSubImage2D = TextureSubImage;
glCopyTextureSubImage2D = CopyTextureSubImage;
glGetTextureImage = GetTexureImage;
glTextureParameteri = TextureParameteri;
glCreateFramebuffers = CreateFramebuffers;
glClearNamedFramebufferfv = ClearNamedFramebufferfv;
glClearNamedFramebufferiv = ClearNamedFramebufferiv;
glClearNamedFramebufferuiv = ClearNamedFramebufferuiv;
glNamedFramebufferDrawBuffers = NamedFramebufferDrawBuffers;
glNamedFramebufferReadBuffer = NamedFramebufferReadBuffer;
glCheckNamedFramebufferStatus = CheckNamedFramebufferStatus;
glCreateBuffers = CreateBuffers;
glNamedBufferStorage = NamedBufferStorage;
glNamedBufferData = NamedBufferData;
glNamedBufferSubData = NamedBufferSubData;
glMapNamedBuffer = MapNamedBuffer;
glMapNamedBufferRange = MapNamedBufferRange;
glUnmapNamedBuffer = UnmapNamedBuffer;
glFlushMappedNamedBufferRange = FlushMappedNamedBufferRange;
glCreateProgramPipelines = CreateProgramPipelines;
glCreateSamplers = CreateSamplers;
}
}
namespace GLLoader { namespace GLLoader {
bool fglrx_buggy_driver = false; bool fglrx_buggy_driver = false;
@ -479,17 +307,9 @@ namespace GLLoader {
status &= status_and_override(found_GL_ARB_clear_texture,"GL_ARB_clear_texture"); status &= status_and_override(found_GL_ARB_clear_texture,"GL_ARB_clear_texture");
// GL4.5 // GL4.5
status &= status_and_override(found_GL_ARB_clip_control, "GL_ARB_clip_control", true); status &= status_and_override(found_GL_ARB_clip_control, "GL_ARB_clip_control", true);
status &= status_and_override(found_GL_ARB_direct_state_access, "GL_ARB_direct_state_access"); status &= status_and_override(found_GL_ARB_direct_state_access, "GL_ARB_direct_state_access", true);
status &= status_and_override(found_GL_ARB_texture_barrier, "GL_ARB_texture_barrier", true); status &= status_and_override(found_GL_ARB_texture_barrier, "GL_ARB_texture_barrier", true);
if (!found_GL_ARB_direct_state_access) {
Emulate_DSA::Init();
}
if (glBindTextureUnit == NULL) {
fprintf(stderr, "FATAL ERROR !!!! Failed to setup DSA function pointer!!!\n");
status = false;
}
#ifdef _WIN32 #ifdef _WIN32
if (status) { if (status) {
if (intel_buggy_driver) { if (intel_buggy_driver) {

8
plugins/GSdx/GLLoader.h
View File

@ -197,7 +197,6 @@ typedef void (APIENTRYP PFNGLGETTEXTUREIMAGEPROC) (GLuint texture, GLint level,
// Note: glActiveTexture & glBlendColor aren't included in the win GL ABI. // Note: glActiveTexture & glBlendColor aren't included in the win GL ABI.
// (maybe gl.h is outdated, or my setup is wrong) // (maybe gl.h is outdated, or my setup is wrong)
// Anyway, let's just keep the mangled function pointer for those 2 functions. // Anyway, let's just keep the mangled function pointer for those 2 functions.
extern PFNGLACTIVETEXTUREPROC gl_ActiveTexture;
extern PFNGLBLENDCOLORPROC gl_BlendColor; extern PFNGLBLENDCOLORPROC gl_BlendColor;
extern PFNGLATTACHSHADERPROC glAttachShader; extern PFNGLATTACHSHADERPROC glAttachShader;
@ -284,7 +283,6 @@ extern PFNGLSCISSORINDEXEDVPROC glScissorIndexedv;
// GL4.2 // GL4.2
extern PFNGLBINDIMAGETEXTUREPROC glBindImageTexture; extern PFNGLBINDIMAGETEXTUREPROC glBindImageTexture;
extern PFNGLMEMORYBARRIERPROC glMemoryBarrier; extern PFNGLMEMORYBARRIERPROC glMemoryBarrier;
extern PFNGLTEXSTORAGE2DPROC glTexStorage2D;
extern PFNGLPOPDEBUGGROUPPROC glPopDebugGroup; extern PFNGLPOPDEBUGGROUPPROC glPopDebugGroup;
// GL4.3 // GL4.3
extern PFNGLCOPYIMAGESUBDATAPROC glCopyImageSubData; extern PFNGLCOPYIMAGESUBDATAPROC glCopyImageSubData;
@ -329,12 +327,6 @@ extern PFNGLCREATEPROGRAMPIPELINESPROC glCreateProgramPipelines;
extern PFNGLCLIPCONTROLPROC glClipControl; extern PFNGLCLIPCONTROLPROC glClipControl;
extern PFNGLTEXTUREBARRIERPROC glTextureBarrier; extern PFNGLTEXTUREBARRIERPROC glTextureBarrier;
namespace Emulate_DSA {
extern void SetFramebufferTarget(GLenum target);
extern void SetBufferTarget(GLenum target);
extern void Init();
}
namespace GLLoader { namespace GLLoader {
bool check_gl_version(int major, int minor); bool check_gl_version(int major, int minor);
void init_gl_function(); void init_gl_function();

56
plugins/GSdx/GSWnd.cpp
View File

@ -25,7 +25,6 @@
void GSWndGL::PopulateGlFunction() void GSWndGL::PopulateGlFunction()
{ {
*(void**)&(gl_ActiveTexture) = GetProcAddress("glActiveTexture");
*(void**)&(gl_BlendColor) = GetProcAddress("glBlendColor"); *(void**)&(gl_BlendColor) = GetProcAddress("glBlendColor");
// Load mandatory function pointer // Load mandatory function pointer
@ -118,7 +117,6 @@ void GSWndGL::PopulateGlFunction()
// GL4.2 // GL4.2
GL_EXT_LOAD_OPT(glBindImageTexture); GL_EXT_LOAD_OPT(glBindImageTexture);
GL_EXT_LOAD_OPT(glMemoryBarrier); GL_EXT_LOAD_OPT(glMemoryBarrier);
GL_EXT_LOAD(glTexStorage2D);
// GL4.3 // GL4.3
GL_EXT_LOAD_OPT(glCopyImageSubData); GL_EXT_LOAD_OPT(glCopyImageSubData);
GL_EXT_LOAD_OPT(glInvalidateTexImage); GL_EXT_LOAD_OPT(glInvalidateTexImage);
@ -131,39 +129,35 @@ void GSWndGL::PopulateGlFunction()
GL_EXT_LOAD(glBufferStorage); GL_EXT_LOAD(glBufferStorage);
// GL4.5 // GL4.5
GL_EXT_LOAD_OPT(glCreateTextures); GL_EXT_LOAD(glCreateTextures);
GL_EXT_LOAD_OPT(glTextureStorage2D); GL_EXT_LOAD(glTextureStorage2D);
GL_EXT_LOAD_OPT(glTextureSubImage2D); GL_EXT_LOAD(glTextureSubImage2D);
GL_EXT_LOAD_OPT(glCopyTextureSubImage2D); GL_EXT_LOAD(glCopyTextureSubImage2D);
GL_EXT_LOAD_OPT(glBindTextureUnit); GL_EXT_LOAD(glBindTextureUnit);
GL_EXT_LOAD_OPT(glGetTextureImage); GL_EXT_LOAD(glGetTextureImage);
GL_EXT_LOAD_OPT(glTextureParameteri); GL_EXT_LOAD(glTextureParameteri);
GL_EXT_LOAD_OPT(glCreateFramebuffers); GL_EXT_LOAD(glCreateFramebuffers);
GL_EXT_LOAD_OPT(glClearNamedFramebufferfv); GL_EXT_LOAD(glClearNamedFramebufferfv);
GL_EXT_LOAD_OPT(glClearNamedFramebufferuiv); GL_EXT_LOAD(glClearNamedFramebufferuiv);
GL_EXT_LOAD_OPT(glClearNamedFramebufferiv); GL_EXT_LOAD(glClearNamedFramebufferiv);
GL_EXT_LOAD_OPT(glNamedFramebufferTexture); GL_EXT_LOAD(glNamedFramebufferTexture);
GL_EXT_LOAD_OPT(glNamedFramebufferDrawBuffers); GL_EXT_LOAD(glNamedFramebufferDrawBuffers);
GL_EXT_LOAD_OPT(glNamedFramebufferReadBuffer); GL_EXT_LOAD(glNamedFramebufferReadBuffer);
GL_EXT_LOAD_OPT(glCheckNamedFramebufferStatus); GL_EXT_LOAD(glCheckNamedFramebufferStatus);
GL_EXT_LOAD_OPT(glCreateBuffers); GL_EXT_LOAD(glCreateBuffers);
GL_EXT_LOAD_OPT(glNamedBufferStorage); GL_EXT_LOAD(glNamedBufferStorage);
GL_EXT_LOAD_OPT(glNamedBufferData); GL_EXT_LOAD(glNamedBufferData);
GL_EXT_LOAD_OPT(glNamedBufferSubData); GL_EXT_LOAD(glNamedBufferSubData);
GL_EXT_LOAD_OPT(glMapNamedBuffer); GL_EXT_LOAD(glMapNamedBuffer);
GL_EXT_LOAD_OPT(glMapNamedBufferRange); GL_EXT_LOAD(glMapNamedBufferRange);
GL_EXT_LOAD_OPT(glUnmapNamedBuffer); GL_EXT_LOAD(glUnmapNamedBuffer);
GL_EXT_LOAD_OPT(glFlushMappedNamedBufferRange); GL_EXT_LOAD(glFlushMappedNamedBufferRange);
GL_EXT_LOAD_OPT(glCreateSamplers); GL_EXT_LOAD(glCreateSamplers);
GL_EXT_LOAD_OPT(glCreateProgramPipelines); GL_EXT_LOAD(glCreateProgramPipelines);
GL_EXT_LOAD(glClipControl); GL_EXT_LOAD(glClipControl);
GL_EXT_LOAD(glTextureBarrier); GL_EXT_LOAD(glTextureBarrier);
if (glCreateFramebuffers == NULL) {
Emulate_DSA::Init();
}
} }