fix (partially) linux compilation
This commit is contained in:
parent
8df9884624
commit
0b5f9bdebc
2 changed files with 14 additions and 4 deletions
|
@ -24,10 +24,18 @@ void GPUFontAtlasLayerCombo::setup(const ComboIdentifier & identifier,
|
|||
shaderCatalog = std::make_shared <ofxGPUFont::ShaderCatalog>(shaderDir);
|
||||
|
||||
if(this->settings.bufferTargetType == GL_TEXTURE_2D_ARRAY){
|
||||
#ifdef TARGET_EMSCRIPTEN
|
||||
fontShader = shaderCatalog->get("font_ta");
|
||||
#else
|
||||
fontShader = shaderCatalog->get("font");
|
||||
#endif
|
||||
}else if(this->settings.bufferTargetType == GL_UNIFORM_BUFFER){
|
||||
#ifdef TARGET_EMSCRIPTEN
|
||||
shaderCatalog->setReplacement("{{CURVES_BUFFER_SIZE}}", "2048");
|
||||
fontShader = shaderCatalog->get("font_ub");
|
||||
#else
|
||||
fontShader = shaderCatalog->get("font");
|
||||
#endif
|
||||
}
|
||||
fontShaderProgram = fontShader->program;
|
||||
|
||||
|
|
|
@ -7,7 +7,9 @@
|
|||
#include "MsdfLayer.h"
|
||||
#include "Utils.h"
|
||||
#include "ofUtils.h"
|
||||
#ifdef TARGET_EMSCRIPTEN
|
||||
#include <GLES3/gl3.h>
|
||||
#endif
|
||||
#include <memory>
|
||||
|
||||
namespace ofxVariableLab {
|
||||
|
|
Loading…
Reference in a new issue