diff options
| author | Timothy Arceri <[email protected]> | 2019-02-22 11:51:24 +1100 |
|---|---|---|
| committer | Timothy Arceri <[email protected]> | 2019-03-06 23:05:20 +0000 |
| commit | 7530d4abfcf9d39fb1b4abeb77cdbf6cf1d411a7 (patch) | |
| tree | f7dec5de299bcb431672f3a7c9209bc871b328a2 /src/compiler | |
| parent | 15b83b3af972fe32de4b1730ef6aff110e5da49a (diff) | |
glsl/freedreno/panfrost: pass gl_context to the standalone compiler
This allows us to use the ctx with glsl_to_nir() in a following
patch.
Reviewed-by: Eric Anholt <[email protected]>
Diffstat (limited to 'src/compiler')
| -rw-r--r-- | src/compiler/glsl/main.cpp | 5 | ||||
| -rw-r--r-- | src/compiler/glsl/standalone.cpp | 4 | ||||
| -rw-r--r-- | src/compiler/glsl/standalone.h | 3 |
3 files changed, 7 insertions, 5 deletions
diff --git a/src/compiler/glsl/main.cpp b/src/compiler/glsl/main.cpp index a730c033917..2ff561e011d 100644 --- a/src/compiler/glsl/main.cpp +++ b/src/compiler/glsl/main.cpp @@ -34,6 +34,7 @@ * offline compile GLSL code and examine the resulting GLSL IR. */ +#include "main/mtypes.h" #include "standalone.h" static struct standalone_options options; @@ -91,8 +92,10 @@ main(int argc, char * const* argv) usage_fail(argv[0]); struct gl_shader_program *whole_program; + static struct gl_context local_ctx; - whole_program = standalone_compile_shader(&options, argc - optind, &argv[optind]); + whole_program = standalone_compile_shader(&options, argc - optind, + &argv[optind], &local_ctx); if (!whole_program) usage_fail(argv[0]); diff --git a/src/compiler/glsl/standalone.cpp b/src/compiler/glsl/standalone.cpp index add4e4ea478..06869a0b3dc 100644 --- a/src/compiler/glsl/standalone.cpp +++ b/src/compiler/glsl/standalone.cpp @@ -400,11 +400,9 @@ compile_shader(struct gl_context *ctx, struct gl_shader *shader) extern "C" struct gl_shader_program * standalone_compile_shader(const struct standalone_options *_options, - unsigned num_files, char* const* files) + unsigned num_files, char* const* files, struct gl_context *ctx) { int status = EXIT_SUCCESS; - static struct gl_context local_ctx; - struct gl_context *ctx = &local_ctx; bool glsl_es = false; options = _options; diff --git a/src/compiler/glsl/standalone.h b/src/compiler/glsl/standalone.h index 5029e168119..d9e14f798a3 100644 --- a/src/compiler/glsl/standalone.h +++ b/src/compiler/glsl/standalone.h @@ -42,7 +42,8 @@ struct gl_shader_program; struct gl_shader_program * standalone_compile_shader( const struct standalone_options *options, - unsigned num_files, char* const* files); + unsigned num_files, char* const* files, + struct gl_context *ctx); void standalone_compiler_cleanup(struct gl_shader_program *prog); |