|
|
@ -84,7 +84,6 @@ OpenGLState::OpenGLState() {
|
|
|
|
draw.draw_framebuffer = 0;
|
|
|
|
draw.draw_framebuffer = 0;
|
|
|
|
draw.vertex_array = 0;
|
|
|
|
draw.vertex_array = 0;
|
|
|
|
draw.vertex_buffer = 0;
|
|
|
|
draw.vertex_buffer = 0;
|
|
|
|
draw.uniform_buffer = 0;
|
|
|
|
|
|
|
|
draw.shader_program = 0;
|
|
|
|
draw.shader_program = 0;
|
|
|
|
draw.program_pipeline = 0;
|
|
|
|
draw.program_pipeline = 0;
|
|
|
|
|
|
|
|
|
|
|
@ -544,10 +543,6 @@ void OpenGLState::ApplyDepthClamp() const {
|
|
|
|
void OpenGLState::Apply() const {
|
|
|
|
void OpenGLState::Apply() const {
|
|
|
|
ApplyFramebufferState();
|
|
|
|
ApplyFramebufferState();
|
|
|
|
ApplyVertexBufferState();
|
|
|
|
ApplyVertexBufferState();
|
|
|
|
// Uniform buffer
|
|
|
|
|
|
|
|
if (draw.uniform_buffer != cur_state.draw.uniform_buffer) {
|
|
|
|
|
|
|
|
glBindBuffer(GL_UNIFORM_BUFFER, draw.uniform_buffer);
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
// Shader program
|
|
|
|
// Shader program
|
|
|
|
if (draw.shader_program != cur_state.draw.shader_program) {
|
|
|
|
if (draw.shader_program != cur_state.draw.shader_program) {
|
|
|
@ -642,9 +637,6 @@ OpenGLState& OpenGLState::ResetBuffer(GLuint handle) {
|
|
|
|
if (draw.vertex_buffer == handle) {
|
|
|
|
if (draw.vertex_buffer == handle) {
|
|
|
|
draw.vertex_buffer = 0;
|
|
|
|
draw.vertex_buffer = 0;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
if (draw.uniform_buffer == handle) {
|
|
|
|
|
|
|
|
draw.uniform_buffer = 0;
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
return *this;
|
|
|
|
return *this;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|