diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2020-03-11 06:52:57 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2020-03-11 06:52:57 +0300 |
| commit | 4184f890fdbef7409af27f1e9a13b01161001ef2 (patch) | |
| tree | 2958d2c1579c5055ff8aa708774150ef8d20a90f /source/blender/gpu/intern/gpu_select_sample_query.c | |
| parent | f9cca128869fc07da46c095ac7dce16467121092 (diff) | |
GPU: minor changes to support standalone GHOST builds
- Move gpuPush/Pop from GPU_draw.h into GPU_state.h
as this is for pushing/popping state.
- Add 'GPU_STANDALONE' define, to bypass use of user-preferences
for theme colors and pixelsize, as well as pbvh init/free functions.
Needed to get GHOST tests working again.
Diffstat (limited to 'source/blender/gpu/intern/gpu_select_sample_query.c')
| -rw-r--r-- | source/blender/gpu/intern/gpu_select_sample_query.c | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/source/blender/gpu/intern/gpu_select_sample_query.c b/source/blender/gpu/intern/gpu_select_sample_query.c index 6e8b062cff0..578546f3af9 100644 --- a/source/blender/gpu/intern/gpu_select_sample_query.c +++ b/source/blender/gpu/intern/gpu_select_sample_query.c @@ -26,9 +26,8 @@ #include <stdlib.h> -#include "GPU_immediate.h" -#include "GPU_draw.h" #include "GPU_select.h" +#include "GPU_state.h" #include "GPU_glew.h" #include "MEM_guardedalloc.h" @@ -37,10 +36,6 @@ #include "BLI_utildefines.h" -#include "PIL_time.h" - -#include "BKE_global.h" - #include "gpu_select_private.h" /* Ad hoc number of queries to allocate to skip doing many glGenQueries */ |