Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-08-09 07:19:14 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix build error, add environment variable

Browse source
This commit is contained in:
HifiExperiments 2019-11-02 01:03:34 -07:00
parent deb5aacfad
commit 6e5217b80d
2 changed files with 8 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
libraries/render-utils/src/MeshPartPayload.cpp
View file

@ -11,6 +11,8 @@
#include "MeshPartPayload.h" #include "MeshPartPayload.h"
#include <QProcess>
#include <PerfStat.h> #include <PerfStat.h>
#include <DualQuaternion.h> #include <DualQuaternion.h>
#include <graphics/ShaderConstants.h> #include <graphics/ShaderConstants.h>
@ -21,6 +23,9 @@
#include "RenderPipelines.h" #include "RenderPipelines.h"
static const QString ENABLE_MESH_SHADERS_STRING { "HIFI_ENABLE_MESH_SHADERS" };
static bool ENABLE_MESH_SHADERS = QProcessEnvironment::systemEnvironment().contains(ENABLE_MESH_SHADERS_STRING);
bool MeshPartPayload::enableMeshShaders = false; bool MeshPartPayload::enableMeshShaders = false;
using namespace render; using namespace render;
@ -466,7 +471,7 @@ void ModelMeshPartPayload::render(RenderArgs* args) {
if (!_drawMaterials.empty() && _drawMaterials.top().material && _drawMaterials.top().material->isProcedural() && if (!_drawMaterials.empty() && _drawMaterials.top().material && _drawMaterials.top().material->isProcedural() &&
_drawMaterials.top().material->isReady()) { _drawMaterials.top().material->isReady()) {
if (!enableMeshShaders) { if (!(enableMeshShaders && ENABLE_MESH_SHADERS)) {
return; return;
} }
auto procedural = std::static_pointer_cast<graphics::ProceduralMaterial>(_drawMaterials.top().material); auto procedural = std::static_pointer_cast<graphics::ProceduralMaterial>(_drawMaterials.top().material);

2
tools/oven/src/OvenCLIApplication.cpp
View file

@ -14,6 +14,8 @@
#include <QtCore/QCommandLineParser> #include <QtCore/QCommandLineParser>
#include <QtCore/QUrl> #include <QtCore/QUrl>
#include <iostream>
#include <image/TextureProcessing.h> #include <image/TextureProcessing.h>
#include <TextureBaker.h> #include <TextureBaker.h>