gl_resource_manager: Sync latest version with Citra.

This commit is contained in:
bunnei 2018-03-19 17:20:49 -04:00
parent 0e4b9cdde4
commit db0cfb8e8b

View File

@ -36,7 +36,7 @@ public:
if (handle == 0) if (handle == 0)
return; return;
glDeleteTextures(1, &handle); glDeleteTextures(1, &handle);
OpenGLState::ResetTexture(handle); OpenGLState::GetCurState().ResetTexture(handle).Apply();
handle = 0; handle = 0;
} }
@ -69,7 +69,7 @@ public:
if (handle == 0) if (handle == 0)
return; return;
glDeleteSamplers(1, &handle); glDeleteSamplers(1, &handle);
OpenGLState::ResetSampler(handle); OpenGLState::GetCurState().ResetSampler(handle).Apply();
handle = 0; handle = 0;
} }
@ -91,10 +91,13 @@ public:
} }
/// Creates a new internal OpenGL resource and stores the handle /// Creates a new internal OpenGL resource and stores the handle
void Create(const char* vert_shader, const char* frag_shader) { void Create(const char* vert_shader, const char* geo_shader, const char* frag_shader,
const std::vector<const char*>& feedback_vars = {},
bool separable_program = false) {
if (handle != 0) if (handle != 0)
return; return;
handle = GLShader::LoadProgram(vert_shader, frag_shader); handle = GLShader::LoadProgram(vert_shader, geo_shader, frag_shader, feedback_vars,
separable_program);
} }
/// Deletes the internal OpenGL resource /// Deletes the internal OpenGL resource
@ -102,7 +105,40 @@ public:
if (handle == 0) if (handle == 0)
return; return;
glDeleteProgram(handle); glDeleteProgram(handle);
OpenGLState::ResetProgram(handle); OpenGLState::GetCurState().ResetProgram(handle).Apply();
handle = 0;
}
GLuint handle = 0;
};
class OGLPipeline : private NonCopyable {
public:
OGLPipeline() = default;
OGLPipeline(OGLPipeline&& o) {
handle = std::exchange<GLuint>(o.handle, 0);
}
~OGLPipeline() {
Release();
}
OGLPipeline& operator=(OGLPipeline&& o) {
handle = std::exchange<GLuint>(o.handle, 0);
return *this;
}
/// Creates a new internal OpenGL resource and stores the handle
void Create() {
if (handle != 0)
return;
glGenProgramPipelines(1, &handle);
}
/// Deletes the internal OpenGL resource
void Release() {
if (handle == 0)
return;
glDeleteProgramPipelines(1, &handle);
OpenGLState::GetCurState().ResetPipeline(handle).Apply();
handle = 0; handle = 0;
} }
@ -135,13 +171,46 @@ public:
if (handle == 0) if (handle == 0)
return; return;
glDeleteBuffers(1, &handle); glDeleteBuffers(1, &handle);
OpenGLState::ResetBuffer(handle); OpenGLState::GetCurState().ResetBuffer(handle).Apply();
handle = 0; handle = 0;
} }
GLuint handle = 0; GLuint handle = 0;
}; };
class OGLSync : private NonCopyable {
public:
OGLSync() = default;
OGLSync(OGLSync&& o) : handle(std::exchange(o.handle, nullptr)) {}
~OGLSync() {
Release();
}
OGLSync& operator=(OGLSync&& o) {
Release();
handle = std::exchange(o.handle, nullptr);
return *this;
}
/// Creates a new internal OpenGL resource and stores the handle
void Create() {
if (handle != 0)
return;
handle = glFenceSync(GL_SYNC_GPU_COMMANDS_COMPLETE, 0);
}
/// Deletes the internal OpenGL resource
void Release() {
if (handle == 0)
return;
glDeleteSync(handle);
handle = 0;
}
GLsync handle = 0;
};
class OGLVertexArray : private NonCopyable { class OGLVertexArray : private NonCopyable {
public: public:
OGLVertexArray() = default; OGLVertexArray() = default;
@ -168,7 +237,7 @@ public:
if (handle == 0) if (handle == 0)
return; return;
glDeleteVertexArrays(1, &handle); glDeleteVertexArrays(1, &handle);
OpenGLState::ResetVertexArray(handle); OpenGLState::GetCurState().ResetVertexArray(handle).Apply();
handle = 0; handle = 0;
} }
@ -201,7 +270,7 @@ public:
if (handle == 0) if (handle == 0)
return; return;
glDeleteFramebuffers(1, &handle); glDeleteFramebuffers(1, &handle);
OpenGLState::ResetFramebuffer(handle); OpenGLState::GetCurState().ResetFramebuffer(handle).Apply();
handle = 0; handle = 0;
} }