forked from bartvdbraak/blender
Use immediate mode API for OpenColorIO
This commit is contained in:
parent
fd5b882a67
commit
513aacbdb6
@ -599,7 +599,6 @@ function(SETUP_BLENDER_SORTED_LIBS)
|
||||
bf_bmesh
|
||||
bf_gpu
|
||||
bf_draw
|
||||
bf_intern_gawain
|
||||
bf_blenloader
|
||||
bf_blenkernel
|
||||
bf_physics
|
||||
@ -656,6 +655,7 @@ function(SETUP_BLENDER_SORTED_LIBS)
|
||||
cycles_util
|
||||
cycles_subd
|
||||
bf_intern_opencolorio
|
||||
bf_intern_gawain
|
||||
bf_intern_eigen
|
||||
extern_rangetree
|
||||
extern_wcwidth
|
||||
|
@ -27,6 +27,7 @@ set(INC
|
||||
.
|
||||
../glew-mx
|
||||
../guardedalloc
|
||||
../gawain
|
||||
../../source/blender/blenlib
|
||||
)
|
||||
|
||||
|
@ -48,6 +48,9 @@
|
||||
# pragma warning(pop)
|
||||
#endif
|
||||
|
||||
extern "C" {
|
||||
#include "gawain/immediate.h"
|
||||
}
|
||||
|
||||
using namespace OCIO_NAMESPACE;
|
||||
|
||||
@ -408,7 +411,7 @@ bool OCIOImpl::setupGLSLDraw(OCIO_GLSLDrawState **state_r, OCIO_ConstProcessorRc
|
||||
|
||||
glActiveTexture(GL_TEXTURE0);
|
||||
|
||||
glUseProgram(state->program);
|
||||
immBindProgram(state->program);
|
||||
|
||||
glUniform1i(glGetUniformLocation(state->program, "image_texture"), 0);
|
||||
glUniform1i(glGetUniformLocation(state->program, "lut3d_texture"), 1);
|
||||
@ -461,7 +464,7 @@ void OCIOImpl::finishGLSLDraw(OCIO_GLSLDrawState *state)
|
||||
{
|
||||
glActiveTexture(state->last_texture_unit);
|
||||
glBindTexture(GL_TEXTURE_2D, state->last_texture);
|
||||
glUseProgram(0);
|
||||
immUnbindProgram();
|
||||
}
|
||||
|
||||
void OCIOImpl::freeGLState(struct OCIO_GLSLDrawState *state)
|
||||
|
Loading…
Reference in New Issue
Block a user