diff options
author | Mike Erwin <significant.bit@gmail.com> | 2017-05-18 23:21:49 +0300 |
---|---|---|
committer | Mike Erwin <significant.bit@gmail.com> | 2017-05-19 01:30:23 +0300 |
commit | 414c1c0e77e9a87faf77b4c40c5cd5f4aacbc4fa (patch) | |
tree | f65e90010717aa04977033fdfd126f997346e59b /source | |
parent | 5ed0944ce6381037ecbb361320a0ed3f64c9183b (diff) |
OpenGL: remove -noglsl option & GPU_extensions_disable
Also removed a leftover reference to the old basic-shader-glsl option.
Diffstat (limited to 'source')
-rw-r--r-- | source/blender/gpu/GPU_extensions.h | 2 | ||||
-rw-r--r-- | source/blender/gpu/intern/gpu_extensions.c | 6 | ||||
-rw-r--r-- | source/creator/creator_args.c | 14 |
3 files changed, 0 insertions, 22 deletions
diff --git a/source/blender/gpu/GPU_extensions.h b/source/blender/gpu/GPU_extensions.h index 2c92f7a2e5b..4f14474bb5f 100644 --- a/source/blender/gpu/GPU_extensions.h +++ b/source/blender/gpu/GPU_extensions.h @@ -38,8 +38,6 @@ extern "C" { /* GPU extensions support */ -void GPU_extensions_disable(void); - bool GPU_legacy_support(void); bool GPU_full_non_power_of_two_support(void); bool GPU_bicubic_bump_support(void); diff --git a/source/blender/gpu/intern/gpu_extensions.c b/source/blender/gpu/intern/gpu_extensions.c index 29c11e7899d..2a2e73c6ba8 100644 --- a/source/blender/gpu/intern/gpu_extensions.c +++ b/source/blender/gpu/intern/gpu_extensions.c @@ -70,7 +70,6 @@ static struct GPUGlobal { GLint maxtextures; GLint maxubosize; GLint maxubobinds; - bool extdisabled; int colordepth; int samples_color_texture_max; GPUDeviceType device; @@ -92,11 +91,6 @@ bool GPU_type_matches(GPUDeviceType device, GPUOSType os, GPUDriverType driver) /* GPU Extensions */ -void GPU_extensions_disable(void) -{ - GG.extdisabled = true; -} - int GPU_max_texture_size(void) { return GG.maxtexsize; diff --git a/source/creator/creator_args.c b/source/creator/creator_args.c index 3850846b0b9..f25efbf72e9 100644 --- a/source/creator/creator_args.c +++ b/source/creator/creator_args.c @@ -70,9 +70,7 @@ #include "WM_api.h" -#include "GPU_basic_shader.h" #include "GPU_draw.h" -#include "GPU_extensions.h" /* for passing information between creator and gameengine */ #ifdef WITH_GAMEENGINE @@ -567,7 +565,6 @@ static int arg_handle_print_help(int UNUSED(argc), const char **UNUSED(argv), vo BLI_argsPrintArgDoc(ba, "--env-system-python"); printf("\n"); BLI_argsPrintArgDoc(ba, "-nojoystick"); - BLI_argsPrintArgDoc(ba, "-noglsl"); BLI_argsPrintArgDoc(ba, "-noaudio"); BLI_argsPrintArgDoc(ba, "-setaudio"); @@ -585,7 +582,6 @@ static int arg_handle_print_help(int UNUSED(argc), const char **UNUSED(argv), vo printf("\n"); printf("Experimental Features:\n"); - BLI_argsPrintArgDoc(ba, "--enable-new-basic-shader-glsl"); /* Other options _must_ be last (anything not handled will show here) */ printf("\n"); @@ -1010,15 +1006,6 @@ static int arg_handle_joystick_disable(int UNUSED(argc), const char **UNUSED(arg return 0; } -static const char arg_handle_glsl_disable_doc[] = -"\n\tDisable GLSL shading" -; -static int arg_handle_glsl_disable(int UNUSED(argc), const char **UNUSED(argv), void *UNUSED(data)) -{ - GPU_extensions_disable(); - return 0; -} - static const char arg_handle_audio_disable_doc[] = "\n\tForce sound system to None" ; @@ -1839,7 +1826,6 @@ void main_args_setup(bContext *C, bArgs *ba, SYS_SystemHandle *syshandle) /* third pass: disabling things and forcing settings */ BLI_argsAddCase(ba, 3, "-nojoystick", 1, NULL, 0, CB(arg_handle_joystick_disable), syshandle); - BLI_argsAddCase(ba, 3, "-noglsl", 1, NULL, 0, CB(arg_handle_glsl_disable), NULL); BLI_argsAddCase(ba, 3, "-noaudio", 1, NULL, 0, CB(arg_handle_audio_disable), NULL); BLI_argsAddCase(ba, 3, "-setaudio", 1, NULL, 0, CB(arg_handle_audio_set), NULL); |