diff options
| author | Kristian Høgsberg Kristensen <[email protected]> | 2015-10-08 12:25:34 -0700 |
|---|---|---|
| committer | Kristian Høgsberg Kristensen <[email protected]> | 2015-10-08 17:20:24 -0700 |
| commit | fc2a66cfcddea34af0e93dd2221ae1fd3fdd9e87 (patch) | |
| tree | 3aa60e04c953b6f25e019cfef00aecb9c11bc4fa /src/mesa/main/ff_fragment_shader.cpp | |
| parent | 48a87f4ba062e572a66f546997366d8896a4ecd1 (diff) | |
| parent | c71f0d45e6d0081ea814fb0b16baec4e75a07bcb (diff) | |
Merge ../mesa into vulkan
Diffstat (limited to 'src/mesa/main/ff_fragment_shader.cpp')
| -rw-r--r-- | src/mesa/main/ff_fragment_shader.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/mesa/main/ff_fragment_shader.cpp b/src/mesa/main/ff_fragment_shader.cpp index c0030bc5687..e4e2a18c1da 100644 --- a/src/mesa/main/ff_fragment_shader.cpp +++ b/src/mesa/main/ff_fragment_shader.cpp @@ -32,6 +32,7 @@ #include "main/imports.h" #include "main/macros.h" #include "main/samplerobj.h" +#include "main/shaderobj.h" #include "main/texenvprogram.h" #include "main/texobj.h" #include "main/uniforms.h" @@ -1208,7 +1209,7 @@ create_new_program(struct gl_context *ctx, struct state_key *key) p.top_instructions = p.shader->ir; p.instructions = p.shader->ir; p.state = key; - p.shader_program = ctx->Driver.NewShaderProgram(0); + p.shader_program = _mesa_new_shader_program(0); /* Tell the linker to ignore the fact that we're building a * separate shader, in case we're in a GLES2 context that would |