|
This patch adds support of curve mapping applied on GPU when having image draw method set to GLSL. This also makes rendered viewport aware of display's transform curve mapping.
Almost all of the new code in the shader is a 1:1 copy of evaluation functions from colortools.c.
Passing curve mapping to a GLSL shader is not as small and easy how i would imagine it to be, but couldn't find easier way to do it. So for now it's like dozen of uniform parameters to be filled in.
As an addition, made it so display transform GLSL shader is data-to-c'ed instead of being hardcoded as a string to the .cc file.
TODO:
- curvemapping_evaluateRGBF could be zapped from the shader.
- texelFetch works awesome, but doesn't exist on my intel card. texture1D gives some darkening which i couldn't figure out yet.
Total comments: 2
|
Unified diffs |
Side-by-side diffs |
Delta from patch set |
Stats (+502 lines, -98 lines) |
Patch |
 |
|
SConstruct
|
View
|
1
2
3
|
1 chunk |
+1 line, -0 lines |
0 comments
|
Download
|
 |
|
intern/opencolorio/CMakeLists.txt
|
View
|
1
2
3
|
1 chunk |
+2 lines, -0 lines |
0 comments
|
Download
|
 |
|
intern/opencolorio/SConscript
|
View
|
1
2
3
|
1 chunk |
+7 lines, -0 lines |
0 comments
|
Download
|
 |
|
intern/opencolorio/fallback_impl.cc
|
View
|
1
2
3
|
1 chunk |
+3 lines, -1 line |
0 comments
|
Download
|
 |
|
intern/opencolorio/gpu_shader_display_transform.glsl
|
View
|
1
2
3
|
1 chunk |
+165 lines, -0 lines |
0 comments
|
Download
|
 |
|
intern/opencolorio/ocio_capi.h
|
View
|
1
2
3
|
2 chunks |
+58 lines, -1 line |
0 comments
|
Download
|
 |
|
intern/opencolorio/ocio_capi.cc
|
View
|
1
2
3
|
1 chunk |
+3 lines, -2 lines |
0 comments
|
Download
|
 |
|
intern/opencolorio/ocio_impl.h
|
View
|
1
2
3
|
3 chunks |
+6 lines, -3 lines |
0 comments
|
Download
|
 |
|
intern/opencolorio/ocio_impl_glsl.cc
|
View
|
1
2
3
|
9 chunks |
+137 lines, -44 lines |
0 comments
|
Download
|
 |
|
source/blender/editors/render/render_internal.c
|
View
|
1
2
3
|
1 chunk |
+1 line, -1 line |
0 comments
|
Download
|
 |
|
source/blender/editors/screen/glutil.c
|
View
|
1
2
3
|
2 chunks |
+3 lines, -6 lines |
0 comments
|
Download
|
 |
|
source/blender/editors/space_sequencer/sequencer_draw.c
|
View
|
1
2
3
|
2 chunks |
+3 lines, -3 lines |
0 comments
|
Download
|
 |
|
source/blender/imbuf/IMB_colormanagement.h
|
View
|
1
2
3
|
1 chunk |
+6 lines, -9 lines |
0 comments
|
Download
|
 |
|
source/blender/imbuf/intern/colormanagement.c
|
View
|
1
2
3
|
9 chunks |
+104 lines, -26 lines |
0 comments
|
Download
|
 |
|
source/blender/makesrna/intern/rna_render.c
|
View
|
1
2
3
|
1 chunk |
+3 lines, -2 lines |
0 comments
|
Download
|
Total messages: 11
|