From ad215f23c6477bc91addc827e1df3ed15a9a8192 Mon Sep 17 00:00:00 2001 From: Atlante45 Date: Mon, 1 Feb 2016 18:49:38 +0100 Subject: [PATCH] Deactivate SSBOs for now --- libraries/gl/src/gl/Config.h | 4 +++- libraries/gpu/src/gpu/Config.slh | 2 +- libraries/gpu/src/gpu/Transform.slh | 3 ++- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/libraries/gl/src/gl/Config.h b/libraries/gl/src/gl/Config.h index 5c04fe0cf8..8f7582c271 100644 --- a/libraries/gl/src/gl/Config.h +++ b/libraries/gl/src/gl/Config.h @@ -49,7 +49,9 @@ #if (GPU_INPUT_PROFILE == GPU_CORE_43) -#define GPU_SSBO_DRAW_CALL_INFO +// Deactivate SSBO for now, we've run into some issues +// on GL 4.3 capable GPUs not behaving as expected +//#define GPU_SSBO_DRAW_CALL_INFO #endif diff --git a/libraries/gpu/src/gpu/Config.slh b/libraries/gpu/src/gpu/Config.slh index 5a96a7eafe..3da92df7c1 100644 --- a/libraries/gpu/src/gpu/Config.slh +++ b/libraries/gpu/src/gpu/Config.slh @@ -13,7 +13,7 @@ <@if GLPROFILE == PC_GL @> <@def GPU_FEATURE_PROFILE GPU_CORE@> - <@def VERSION_HEADER #version 430 core@> + <@def VERSION_HEADER #version 410 core@> <@elif GLPROFILE == MAC_GL @> <@def GPU_FEATURE_PROFILE GPU_CORE@> <@def VERSION_HEADER #version 410 core@> diff --git a/libraries/gpu/src/gpu/Transform.slh b/libraries/gpu/src/gpu/Transform.slh index 6e73834aed..ea5ee06a7b 100644 --- a/libraries/gpu/src/gpu/Transform.slh +++ b/libraries/gpu/src/gpu/Transform.slh @@ -37,7 +37,8 @@ struct TransformObject { layout(location=15) in ivec2 _drawCallInfo; -<@if GLPROFILE == PC_GL @> +<@if FALSE @> +// Disable SSBOs for now layout(std140) buffer transformObjectBuffer { TransformObject _object[]; };