bartvdbraak/blender
1
0
Fork 4
Code Issues 4 Pull Requests 1 Actions 1 Packages Projects Releases Wiki Activity

OCIO: Make GLSL implementation use GPUUniformBuf to avoid debug errors

Browse Source 
Now that we use internal state info, we require drawing that uses the
GPU api to use it throughout the whole pipeline. This is in order to
track the GL state and do our own error checking.
This commit is contained in:
Clément Foucault 2020-09-01 02:58:48 +02:00
parent 53a806f6df
commit a6185e4fa5
1 changed files with 7 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
intern/opencolorio/ocio_impl_glsl.cc
View File

@ -47,6 +47,7 @@
#include "GPU_immediate.h" #include "GPU_immediate.h"
#include "GPU_shader.h" #include "GPU_shader.h"
#include "GPU_uniform_buffer.h"
using namespace OCIO_NAMESPACE; using namespace OCIO_NAMESPACE;
@ -119,8 +120,8 @@ struct OCIO_GLSLLut3d {
struct OCIO_GLSLCurveMappping { struct OCIO_GLSLCurveMappping {
/** Cache IDs */ /** Cache IDs */
size_t cacheId; size_t cacheId;
/** OpenGL Uniform Buffer handle. 0 if not allocated. */ /** GPU Uniform Buffer handle. 0 if not allocated. */
GLuint buffer; GPUUniformBuf *buffer;
/** OpenGL Texture handles. 0 if not allocated. */ /** OpenGL Texture handles. 0 if not allocated. */
GLuint texture; GLuint texture;
/** Error checking. */ /** Error checking. */
@ -370,10 +371,7 @@ static void ensureGLSLCurveMapping(OCIO_GLSLCurveMappping **curvemap_ptr,
allocateCurveMappingTexture(curvemap, curve_mapping_settings); allocateCurveMappingTexture(curvemap, curve_mapping_settings);
/* Uniform buffer object. */ /* Uniform buffer object. */
glGenBuffers(1, &curvemap->buffer); curvemap->buffer = GPU_uniformbuf_create(sizeof(OCIO_GLSLCurveMappingParameters));
glBindBuffer(GL_UNIFORM_BUFFER, curvemap->buffer);
glBufferData(GL_UNIFORM_BUFFER, sizeof(OCIO_GLSLCurveMappingParameters), 0, GL_DYNAMIC_DRAW);
glBindBuffer(GL_UNIFORM_BUFFER, 0);
curvemap->valid = (curvemap->texture != 0); curvemap->valid = (curvemap->texture != 0);
curvemap->cacheId = 0; curvemap->cacheId = 0;
@ -384,7 +382,7 @@ static void ensureGLSLCurveMapping(OCIO_GLSLCurveMappping **curvemap_ptr,
static void freeGLSLCurveMapping(OCIO_GLSLCurveMappping *curvemap) static void freeGLSLCurveMapping(OCIO_GLSLCurveMappping *curvemap)
{ {
glDeleteTextures(1, &curvemap->texture); glDeleteTextures(1, &curvemap->texture);
glDeleteBuffers(1, &curvemap->buffer); GPU_uniformbuf_free(curvemap->buffer);
OBJECT_GUARDED_DELETE(curvemap, OCIO_GLSLCurveMappping); OBJECT_GUARDED_DELETE(curvemap, OCIO_GLSLCurveMappping);
} }
@ -438,9 +436,7 @@ static void updateGLSLCurveMapping(OCIO_GLSLCurveMappping *curvemap,
data.curve_mapping_lut_size = curve_mapping_settings->lut_size; data.curve_mapping_lut_size = curve_mapping_settings->lut_size;
data.curve_mapping_use_extend_extrapolate = curve_mapping_settings->use_extend_extrapolate; data.curve_mapping_use_extend_extrapolate = curve_mapping_settings->use_extend_extrapolate;
glBindBuffer(GL_UNIFORM_BUFFER, curvemap->buffer); GPU_uniformbuf_update(curvemap->buffer, &data);
glBufferSubData(GL_UNIFORM_BUFFER, 0, sizeof(OCIO_GLSLCurveMappingParameters), &data);
glBindBuffer(GL_UNIFORM_BUFFER, 0);
curvemap->cacheId = cacheId; curvemap->cacheId = cacheId;
} }
@ -597,7 +593,7 @@ bool OCIOImpl::setupGLSLDraw(OCIO_GLSLDrawState **state_r,
glActiveTexture(GL_TEXTURE0); glActiveTexture(GL_TEXTURE0);
/* Bind UBO. */ /* Bind UBO. */
glBindBufferBase(GL_UNIFORM_BUFFER, shader->ubo_bind, shader_curvemap->buffer); GPU_uniformbuf_bind(shader_curvemap->buffer, shader->ubo_bind);
/* TODO(fclem) remove remains of IMM. */ /* TODO(fclem) remove remains of IMM. */
immBindShader(shader->shader); immBindShader(shader->shader);