diff options
| author | Mike Erwin <significant.bit@gmail.com> | 2017-03-27 08:16:18 +0300 |
|---|---|---|
| committer | Mike Erwin <significant.bit@gmail.com> | 2017-03-27 08:16:18 +0300 |
| commit | b95ee78ed3f1851443aea871ffd1b1fd36e5ab1b (patch) | |
| tree | 9a22b58d2323040d89c49a1ac49318cb0aca2fd3 /source/blender/gpu/intern/gpu_codegen.c | |
| parent | 159f56f4abf30ed1f4b81645a325d051e880cb16 (diff) | |
OpenGL: prepare GLSL for version 3.3
- use in/out instead of attribute/varying
- use named output instead of gl_FragColor
- use texture() instead of the multitude of older texture sampling functions
The #if __VERSION__ == 120 paths (needed on Mac) will be removed after we switch to 3.3 core profile.
Part of T49165 (general OpenGL upgrade)
Diffstat (limited to 'source/blender/gpu/intern/gpu_codegen.c')
| -rw-r--r-- | source/blender/gpu/intern/gpu_codegen.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/gpu/intern/gpu_codegen.c b/source/blender/gpu/intern/gpu_codegen.c index fed928b53ba..df3b6f962e5 100644 --- a/source/blender/gpu/intern/gpu_codegen.c +++ b/source/blender/gpu/intern/gpu_codegen.c @@ -653,7 +653,7 @@ static void codegen_call_functions(DynStr *ds, ListBase *nodes, GPUOutput *final BLI_dynstr_append(ds, ");\n"); } - BLI_dynstr_append(ds, "\n\tgl_FragColor = "); + BLI_dynstr_append(ds, "\n\tfragColor = "); codegen_convert_datatype(ds, finaloutput->type, GPU_VEC4, "tmp", finaloutput->id); BLI_dynstr_append(ds, ";\n"); } |