Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-05-29 12:12:23 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'RC-21' back into master

Browse source 
Conflicts:
	libraries/gpu-gl/src/gpu/gl45/GL45BackendTexture.cpp
This commit is contained in:
Brad Davis 2016-09-28 09:58:13 -07:00
commit f73cd1d65e
1 changed files with 0 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
libraries/gpu-gl/src/gpu/gl45/GL45BackendTexture.cpp
View file

@ -27,7 +27,6 @@ using namespace gpu::gl;
using namespace gpu::gl45; using namespace gpu::gl45;
#ifdef Q_OS_WIN #ifdef Q_OS_WIN
#define MIN_CORES_FOR_INCREMENTAL_TEXTURES 5 #define MIN_CORES_FOR_INCREMENTAL_TEXTURES 5
static const QString DEBUG_FLAG_INCREMENTAL("HIFI_DISABLE_INCREMENTAL_TEXTURES"); static const QString DEBUG_FLAG_INCREMENTAL("HIFI_DISABLE_INCREMENTAL_TEXTURES");
static const QString DEBUG_FLAG_SPARSE("HIFI_DISABLE_SPARSE_TEXTURES"); static const QString DEBUG_FLAG_SPARSE("HIFI_DISABLE_SPARSE_TEXTURES");