Skip to content

Commit 990c99d

Browse files
deltaoscarmikedeltaoscarmike
committed
- Fix for travis
- Convert glProgramUniform* for OGL 3.x compatibility
1 parent a6484e0 commit 990c99d

File tree

7 files changed

+60
-64
lines changed

7 files changed

+60
-64
lines changed

‎.travis.yml‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@ script:
1313
- test -e src/projectM-sdl/projectMSDL
1414
- test -e src/libprojectM/libprojectM.la
1515
- test -e dist_install/share/projectM/fonts/Vera.ttf
16-
- test -e dist_install/share/projectM/shaders/blur.cg
1716
- test -d dist_install/share/projectM/presets
1817
- test -e dist_install/lib/libprojectM.la
1918
- test -e dist_install/include/libprojectM/projectM.hpp
@@ -34,8 +33,6 @@ matrix:
3433
- libsdl2-dev
3534
- libglew-dev
3635
- libftgl-dev
37-
- libsdl2-dev
38-
- libdevil-dev
3936
- libglm-dev
4037
env:
4138
- MATRIX_EVAL="CC=clang-5.0 && CXX=clang++-5.0"
@@ -50,8 +47,6 @@ matrix:
5047
- libsdl2-dev
5148
- libglew-dev
5249
- libftgl-dev
53-
- libsdl2-dev
54-
- libdevil-dev
5550
- libglm-dev
5651
env:
5752
- MATRIX_EVAL="CC=gcc-7 && CXX=g++-7"

‎configure.ac‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -75,6 +75,9 @@ AC_CONFIG_FILES([src/libprojectM/config.inp.in])
7575
AC_PREFIX_DEFAULT([/usr/local])
7676

7777
AC_PROG_MKDIR_P
78+
79+
AX_CHECK_COMPILE_FLAG([-stdlib=libstdc++], [
80+
CXXFLAGS="$CXXFLAGS -stdlib=libstdc++"])
7881

7982
AX_CHECK_COMPILE_FLAG([-std=c++14], [
8083
CXXFLAGS="$CXXFLAGS -std=c++14"])

‎src/libprojectM/Renderer/HLSLTranslator.cpp‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
using namespace M4;
1111

1212

13-
std::unique_ptr<std::string> HLSLTranslator::parse(const std::string & shaderType, const char *fileName, const std::string &fullSource) {
13+
std::string HLSLTranslator::parse(const std::string & shaderType, const char *fileName, const std::string &fullSource) {
1414
// alloc
1515
GLSLGenerator generator;
1616
Allocator allocator;
@@ -37,7 +37,7 @@ std::unique_ptr<std::string> HLSLTranslator::parse(const std::string & shaderTyp
3737
out2 << sourcePreprocessed;
3838
out2.close();
3939
#endif
40-
return nullptr;
40+
return std::string();
4141
}
4242

4343
// generate GLSL
@@ -50,10 +50,10 @@ std::unique_ptr<std::string> HLSLTranslator::parse(const std::string & shaderTyp
5050
out2 << sourcePreprocessed;
5151
out2.close();
5252
#endif
53-
return nullptr;
53+
return std::string();
5454
}
5555

56-
return std::make_unique<std::string>(generator.GetResult());
56+
return std::string(generator.GetResult());
5757
}
5858

5959

‎src/libprojectM/Renderer/HLSLTranslator.hpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727

2828
class HLSLTranslator {
2929
public:
30-
std::unique_ptr<std::string> parse(const std::string & shaderType, const char *fileName, const std::string &fullSource);
30+
std::string parse(const std::string & shaderType, const char *fileName, const std::string &fullSource);
3131
};
3232

3333
#endif

‎src/libprojectM/Renderer/ShaderEngine.cpp‎

Lines changed: 48 additions & 48 deletions
Original file line numberDiff line numberDiff line change
@@ -711,8 +711,8 @@ GLuint ShaderEngine::compilePresetShader(const PresentShaderType shaderType, Sha
711711

712712
// transpile from HLSL (aka preset shader aka directX shader) to GLSL (aka OpenGL shader lang)
713713
HLSLTranslator translator = HLSLTranslator();
714-
std::unique_ptr<std::string> glslSource = translator.parse(shaderTypeString, shaderFilename.c_str(), fullSource);
715-
if (!glslSource) {
714+
std::string glslSource = translator.parse(shaderTypeString, shaderFilename.c_str(), fullSource);
715+
if (glslSource.empty()) {
716716
std::cerr << "Failed to translate " << shaderTypeString << std::endl;
717717
return GL_FALSE;
718718
}
@@ -721,9 +721,9 @@ GLuint ShaderEngine::compilePresetShader(const PresentShaderType shaderType, Sha
721721
// copmile the preset shader fragment shader with the standard vertex shader and cross our fingers
722722
GLuint ret = 0;
723723
if (shaderType == PresentWarpShader) {
724-
ret = CompileShaderProgram(presetWarpVertexShader, *glslSource.get(), shaderTypeString); // returns new program
724+
ret = CompileShaderProgram(presetWarpVertexShader, glslSource, shaderTypeString); // returns new program
725725
} else {
726-
ret = CompileShaderProgram(presetCompVertexShader, *glslSource.get(), shaderTypeString); // returns new program
726+
ret = CompileShaderProgram(presetCompVertexShader, glslSource, shaderTypeString); // returns new program
727727
}
728728

729729
if (ret != GL_FALSE) {
@@ -735,7 +735,7 @@ GLuint ShaderEngine::compilePresetShader(const PresentShaderType shaderType, Sha
735735
std::cerr << "Source:" << std::endl << *glslSource.get() << std::endl;
736736
#else
737737
std::ofstream out2("/tmp/shader_glsl_" + shaderTypeString + ".txt");
738-
out2 << *glslSource.get();
738+
out2 << glslSource;
739739
out2.close();
740740
#endif
741741
}
@@ -755,40 +755,40 @@ void ShaderEngine::SetupShaderVariables(GLuint program, const Pipeline &pipeline
755755
float mip_y = logf((float)texsizeX)/logf(2.0f);
756756
float mip_avg = 0.5f*(mip_x + mip_y);
757757

758-
glProgramUniform4f(program, glGetUniformLocation(program, "rand_frame"), (rand() % 100) * .01, (rand() % 100) * .01, (rand()% 100) * .01, (rand() % 100) * .01);
759-
glProgramUniform4f(program, glGetUniformLocation(program, "rand_preset"), rand_preset[0], rand_preset[1], rand_preset[2], rand_preset[3]);
758+
glUniform4f(glGetUniformLocation(program, "rand_frame"), (rand() % 100) * .01, (rand() % 100) * .01, (rand()% 100) * .01, (rand() % 100) * .01);
759+
glUniform4f(glGetUniformLocation(program, "rand_preset"), rand_preset[0], rand_preset[1], rand_preset[2], rand_preset[3]);
760760

761-
glProgramUniform4f(program, glGetUniformLocation(program, "_c0"), aspectX, aspectY, 1 / aspectX, 1 / aspectY);
762-
glProgramUniform4f(program, glGetUniformLocation(program, "_c1"), 0.0, 0.0, 0.0, 0.0);
763-
glProgramUniform4f(program, glGetUniformLocation(program, "_c2"), time_since_preset_start_wrapped, context.fps, context.frame, context.progress);
764-
glProgramUniform4f(program, glGetUniformLocation(program, "_c3"), beatDetect->bass/100, beatDetect->mid/100, beatDetect->treb/100, beatDetect->vol/100);
765-
glProgramUniform4f(program, glGetUniformLocation(program, "_c4"), beatDetect->bass_att/100, beatDetect->mid_att/100, beatDetect->treb_att/100, beatDetect->vol_att/100);
766-
glProgramUniform4f(program, glGetUniformLocation(program, "_c5"), pipeline.blur1x-pipeline.blur1n, pipeline.blur1n, pipeline.blur2x-pipeline.blur2n, pipeline.blur2n);
767-
glProgramUniform4f(program, glGetUniformLocation(program, "_c6"), pipeline.blur3x-pipeline.blur3n, pipeline.blur3n, pipeline.blur1n, pipeline.blur1x);
768-
glProgramUniform4f(program, glGetUniformLocation(program, "_c7"), texsizeX, texsizeY, 1 / (float) texsizeX, 1 / (float) texsizeY);
761+
glUniform4f(glGetUniformLocation(program, "_c0"), aspectX, aspectY, 1 / aspectX, 1 / aspectY);
762+
glUniform4f(glGetUniformLocation(program, "_c1"), 0.0, 0.0, 0.0, 0.0);
763+
glUniform4f(glGetUniformLocation(program, "_c2"), time_since_preset_start_wrapped, context.fps, context.frame, context.progress);
764+
glUniform4f(glGetUniformLocation(program, "_c3"), beatDetect->bass/100, beatDetect->mid/100, beatDetect->treb/100, beatDetect->vol/100);
765+
glUniform4f(glGetUniformLocation(program, "_c4"), beatDetect->bass_att/100, beatDetect->mid_att/100, beatDetect->treb_att/100, beatDetect->vol_att/100);
766+
glUniform4f(glGetUniformLocation(program, "_c5"), pipeline.blur1x-pipeline.blur1n, pipeline.blur1n, pipeline.blur2x-pipeline.blur2n, pipeline.blur2n);
767+
glUniform4f(glGetUniformLocation(program, "_c6"), pipeline.blur3x-pipeline.blur3n, pipeline.blur3n, pipeline.blur1n, pipeline.blur1x);
768+
glUniform4f(glGetUniformLocation(program, "_c7"), texsizeX, texsizeY, 1 / (float) texsizeX, 1 / (float) texsizeY);
769769

770-
glProgramUniform4f(program, glGetUniformLocation(program, "_c8"), 0.5f+0.5f*cosf(context.time* 0.329f+1.2f),
770+
glUniform4f(glGetUniformLocation(program, "_c8"), 0.5f+0.5f*cosf(context.time* 0.329f+1.2f),
771771
0.5f+0.5f*cosf(context.time* 1.293f+3.9f),
772772
0.5f+0.5f*cosf(context.time* 5.070f+2.5f),
773773
0.5f+0.5f*cosf(context.time*20.051f+5.4f));
774774

775-
glProgramUniform4f(program, glGetUniformLocation(program, "_c9"), 0.5f+0.5f*sinf(context.time* 0.329f+1.2f),
775+
glUniform4f(glGetUniformLocation(program, "_c9"), 0.5f+0.5f*sinf(context.time* 0.329f+1.2f),
776776
0.5f+0.5f*sinf(context.time* 1.293f+3.9f),
777777
0.5f+0.5f*sinf(context.time* 5.070f+2.5f),
778778
0.5f+0.5f*sinf(context.time*20.051f+5.4f));
779779

780-
glProgramUniform4f(program, glGetUniformLocation(program, "_c10"), 0.5f+0.5f*cosf(context.time*0.0050f+2.7f),
780+
glUniform4f(glGetUniformLocation(program, "_c10"), 0.5f+0.5f*cosf(context.time*0.0050f+2.7f),
781781
0.5f+0.5f*cosf(context.time*0.0085f+5.3f),
782782
0.5f+0.5f*cosf(context.time*0.0133f+4.5f),
783783
0.5f+0.5f*cosf(context.time*0.0217f+3.8f));
784784

785-
glProgramUniform4f(program, glGetUniformLocation(program, "_c11"), 0.5f+0.5f*sinf(context.time*0.0050f+2.7f),
785+
glUniform4f(glGetUniformLocation(program, "_c11"), 0.5f+0.5f*sinf(context.time*0.0050f+2.7f),
786786
0.5f+0.5f*sinf(context.time*0.0085f+5.3f),
787787
0.5f+0.5f*sinf(context.time*0.0133f+4.5f),
788788
0.5f+0.5f*sinf(context.time*0.0217f+3.8f));
789789

790-
glProgramUniform4f(program, glGetUniformLocation(program, "_c12"), mip_x, mip_y, mip_avg, 0 );
791-
glProgramUniform4f(program, glGetUniformLocation(program, "_c13"), pipeline.blur2n, pipeline.blur2x, pipeline.blur3n, pipeline.blur3x);
790+
glUniform4f(glGetUniformLocation(program, "_c12"), mip_x, mip_y, mip_avg, 0 );
791+
glUniform4f(glGetUniformLocation(program, "_c13"), pipeline.blur2n, pipeline.blur2x, pipeline.blur3n, pipeline.blur3x);
792792

793793

794794
glm::mat4 temp_mat[24];
@@ -825,36 +825,36 @@ void ShaderEngine::SetupShaderVariables(GLuint program, const Pipeline &pipeline
825825
temp_mat[i] = my * temp_mat[i];
826826
}
827827

828-
glProgramUniformMatrix4x3fv(program, glGetUniformLocation(program, "rot_s1"), 1, GL_FALSE, glm::value_ptr(glm::mat4x3(temp_mat[0])));
829-
glProgramUniformMatrix4x3fv(program, glGetUniformLocation(program, "rot_s2"), 1, GL_FALSE, glm::value_ptr(glm::mat4x3(temp_mat[1])));
830-
glProgramUniformMatrix4x3fv(program, glGetUniformLocation(program, "rot_s3"), 1, GL_FALSE, glm::value_ptr(glm::mat4x3(temp_mat[2])));
831-
glProgramUniformMatrix4x3fv(program, glGetUniformLocation(program, "rot_s4"), 1, GL_FALSE, glm::value_ptr(glm::mat4x3(temp_mat[3])));
832-
glProgramUniformMatrix4x3fv(program, glGetUniformLocation(program, "rot_d1"), 1, GL_FALSE, glm::value_ptr(glm::mat4x3(temp_mat[4])));
833-
glProgramUniformMatrix4x3fv(program, glGetUniformLocation(program, "rot_d2"), 1, GL_FALSE, glm::value_ptr(glm::mat4x3(temp_mat[5])));
834-
glProgramUniformMatrix4x3fv(program, glGetUniformLocation(program, "rot_d3"), 1, GL_FALSE, glm::value_ptr(glm::mat4x3(temp_mat[6])));
835-
glProgramUniformMatrix4x3fv(program, glGetUniformLocation(program, "rot_d4"), 1, GL_FALSE, glm::value_ptr(glm::mat4x3(temp_mat[7])));
836-
glProgramUniformMatrix4x3fv(program, glGetUniformLocation(program, "rot_f1"), 1, GL_FALSE, glm::value_ptr(glm::mat4x3(temp_mat[8])));
837-
glProgramUniformMatrix4x3fv(program, glGetUniformLocation(program, "rot_f2"), 1, GL_FALSE, glm::value_ptr(glm::mat4x3(temp_mat[9])));
838-
glProgramUniformMatrix4x3fv(program, glGetUniformLocation(program, "rot_f3"), 1, GL_FALSE, glm::value_ptr(glm::mat4x3(temp_mat[10])));
839-
glProgramUniformMatrix4x3fv(program, glGetUniformLocation(program, "rot_f4"), 1, GL_FALSE, glm::value_ptr(glm::mat4x3(temp_mat[11])));
840-
glProgramUniformMatrix4x3fv(program, glGetUniformLocation(program, "rot_vf1"), 1, GL_FALSE, glm::value_ptr(glm::mat4x3(temp_mat[12])));
841-
glProgramUniformMatrix4x3fv(program, glGetUniformLocation(program, "rot_vf2"), 1, GL_FALSE, glm::value_ptr(glm::mat4x3(temp_mat[13])));
842-
glProgramUniformMatrix4x3fv(program, glGetUniformLocation(program, "rot_vf3"), 1, GL_FALSE, glm::value_ptr(glm::mat4x3(temp_mat[14])));
843-
glProgramUniformMatrix4x3fv(program, glGetUniformLocation(program, "rot_vf4"), 1, GL_FALSE, glm::value_ptr(glm::mat4x3(temp_mat[15])));
844-
glProgramUniformMatrix4x3fv(program, glGetUniformLocation(program, "rot_uf1"), 1, GL_FALSE, glm::value_ptr(glm::mat4x3(temp_mat[16])));
845-
glProgramUniformMatrix4x3fv(program, glGetUniformLocation(program, "rot_uf2"), 1, GL_FALSE, glm::value_ptr(glm::mat4x3(temp_mat[17])));
846-
glProgramUniformMatrix4x3fv(program, glGetUniformLocation(program, "rot_uf3"), 1, GL_FALSE, glm::value_ptr(glm::mat4x3(temp_mat[18])));
847-
glProgramUniformMatrix4x3fv(program, glGetUniformLocation(program, "rot_uf4"), 1, GL_FALSE, glm::value_ptr(glm::mat4x3(temp_mat[19])));
848-
glProgramUniformMatrix4x3fv(program, glGetUniformLocation(program, "rot_rand1"), 1, GL_FALSE, glm::value_ptr(glm::mat4x3(temp_mat[20])));
849-
glProgramUniformMatrix4x3fv(program, glGetUniformLocation(program, "rot_rand2"), 1, GL_FALSE, glm::value_ptr(glm::mat4x3(temp_mat[21])));
850-
glProgramUniformMatrix4x3fv(program, glGetUniformLocation(program, "rot_rand3"), 1, GL_FALSE, glm::value_ptr(glm::mat4x3(temp_mat[22])));
851-
glProgramUniformMatrix4x3fv(program, glGetUniformLocation(program, "rot_rand4"), 1, GL_FALSE, glm::value_ptr(glm::mat4x3(temp_mat[23])));
828+
glUniformMatrix4x3fv(glGetUniformLocation(program, "rot_s1"), 1, GL_FALSE, glm::value_ptr(glm::mat4x3(temp_mat[0])));
829+
glUniformMatrix4x3fv(glGetUniformLocation(program, "rot_s2"), 1, GL_FALSE, glm::value_ptr(glm::mat4x3(temp_mat[1])));
830+
glUniformMatrix4x3fv(glGetUniformLocation(program, "rot_s3"), 1, GL_FALSE, glm::value_ptr(glm::mat4x3(temp_mat[2])));
831+
glUniformMatrix4x3fv(glGetUniformLocation(program, "rot_s4"), 1, GL_FALSE, glm::value_ptr(glm::mat4x3(temp_mat[3])));
832+
glUniformMatrix4x3fv(glGetUniformLocation(program, "rot_d1"), 1, GL_FALSE, glm::value_ptr(glm::mat4x3(temp_mat[4])));
833+
glUniformMatrix4x3fv(glGetUniformLocation(program, "rot_d2"), 1, GL_FALSE, glm::value_ptr(glm::mat4x3(temp_mat[5])));
834+
glUniformMatrix4x3fv(glGetUniformLocation(program, "rot_d3"), 1, GL_FALSE, glm::value_ptr(glm::mat4x3(temp_mat[6])));
835+
glUniformMatrix4x3fv(glGetUniformLocation(program, "rot_d4"), 1, GL_FALSE, glm::value_ptr(glm::mat4x3(temp_mat[7])));
836+
glUniformMatrix4x3fv(glGetUniformLocation(program, "rot_f1"), 1, GL_FALSE, glm::value_ptr(glm::mat4x3(temp_mat[8])));
837+
glUniformMatrix4x3fv(glGetUniformLocation(program, "rot_f2"), 1, GL_FALSE, glm::value_ptr(glm::mat4x3(temp_mat[9])));
838+
glUniformMatrix4x3fv(glGetUniformLocation(program, "rot_f3"), 1, GL_FALSE, glm::value_ptr(glm::mat4x3(temp_mat[10])));
839+
glUniformMatrix4x3fv(glGetUniformLocation(program, "rot_f4"), 1, GL_FALSE, glm::value_ptr(glm::mat4x3(temp_mat[11])));
840+
glUniformMatrix4x3fv(glGetUniformLocation(program, "rot_vf1"), 1, GL_FALSE, glm::value_ptr(glm::mat4x3(temp_mat[12])));
841+
glUniformMatrix4x3fv(glGetUniformLocation(program, "rot_vf2"), 1, GL_FALSE, glm::value_ptr(glm::mat4x3(temp_mat[13])));
842+
glUniformMatrix4x3fv(glGetUniformLocation(program, "rot_vf3"), 1, GL_FALSE, glm::value_ptr(glm::mat4x3(temp_mat[14])));
843+
glUniformMatrix4x3fv(glGetUniformLocation(program, "rot_vf4"), 1, GL_FALSE, glm::value_ptr(glm::mat4x3(temp_mat[15])));
844+
glUniformMatrix4x3fv(glGetUniformLocation(program, "rot_uf1"), 1, GL_FALSE, glm::value_ptr(glm::mat4x3(temp_mat[16])));
845+
glUniformMatrix4x3fv(glGetUniformLocation(program, "rot_uf2"), 1, GL_FALSE, glm::value_ptr(glm::mat4x3(temp_mat[17])));
846+
glUniformMatrix4x3fv(glGetUniformLocation(program, "rot_uf3"), 1, GL_FALSE, glm::value_ptr(glm::mat4x3(temp_mat[18])));
847+
glUniformMatrix4x3fv(glGetUniformLocation(program, "rot_uf4"), 1, GL_FALSE, glm::value_ptr(glm::mat4x3(temp_mat[19])));
848+
glUniformMatrix4x3fv(glGetUniformLocation(program, "rot_rand1"), 1, GL_FALSE, glm::value_ptr(glm::mat4x3(temp_mat[20])));
849+
glUniformMatrix4x3fv(glGetUniformLocation(program, "rot_rand2"), 1, GL_FALSE, glm::value_ptr(glm::mat4x3(temp_mat[21])));
850+
glUniformMatrix4x3fv(glGetUniformLocation(program, "rot_rand3"), 1, GL_FALSE, glm::value_ptr(glm::mat4x3(temp_mat[22])));
851+
glUniformMatrix4x3fv(glGetUniformLocation(program, "rot_rand4"), 1, GL_FALSE, glm::value_ptr(glm::mat4x3(temp_mat[23])));
852852

853853
// set program uniform "_q[a-h]" values (_qa.x, _qa.y, _qa.z, _qa.w, _qb.x, _qb.y ... ) alias q[1-32]
854854
for (int i=0; i < 32; i+=4) {
855855
std::string varName = "_q";
856856
varName.push_back('a' + i/4);
857-
glProgramUniform4f(program, glGetUniformLocation(program, varName.c_str()), pipeline.q[i], pipeline.q[i+1], pipeline.q[i+2], pipeline.q[i+3]);
857+
glUniform4f(glGetUniformLocation(program, varName.c_str()), pipeline.q[i], pipeline.q[i+1], pipeline.q[i+2], pipeline.q[i+3]);
858858
}
859859
}
860860

@@ -887,8 +887,8 @@ void ShaderEngine::SetupTextures(GLuint program, const Shader &shader)
887887
std::string texsizeName = "texsize_" + texName;
888888
GLint textSizeParam = glGetUniformLocation(program, texsizeName.c_str());
889889
if (param >= 0) {
890-
glProgramUniform4f(program, textSizeParam, texture->width, texture->height,
891-
1 / (float) texture->width, 1 / (float) texture->height);
890+
glUniform4f(textSizeParam, texture->width, texture->height,
891+
1 / (float) texture->width, 1 / (float) texture->height);
892892
} else {
893893
std::cerr << "invalid texsize name " << texsizeName << std::endl;
894894
return;

‎src/libprojectM/Renderer/TextureManager.cpp‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -196,7 +196,7 @@ TextureSamplerDesc TextureManager::getTexture(const std::string fullName, const
196196
ExtractTextureSettings(fullName, wrap_mode, filter_mode, name);
197197
if (textures.find(name) == textures.end())
198198
{
199-
return {NULL, NULL};
199+
return TextureSamplerDesc(NULL, NULL);
200200
}
201201

202202
if (fullName == name) {
@@ -209,7 +209,7 @@ TextureSamplerDesc TextureManager::getTexture(const std::string fullName, const
209209
Texture * texture = textures[name];
210210
Sampler * sampler = texture->getSampler(wrap_mode, filter_mode);
211211

212-
return {texture, sampler};
212+
return TextureSamplerDesc(texture, sampler);
213213
}
214214

215215

@@ -246,15 +246,15 @@ TextureSamplerDesc TextureManager::loadTexture(const std::string name, const std
246246

247247
if (tex == 0)
248248
{
249-
return {NULL, NULL};
249+
return TextureSamplerDesc(NULL, NULL);
250250
}
251251

252252
Texture * newTexture = new Texture(tex, GL_TEXTURE_2D, width, height, true);
253253
Sampler * sampler = newTexture->getSampler(GL_CLAMP_TO_EDGE, GL_LINEAR);
254254

255255
textures[name] = newTexture;
256256

257-
return {newTexture, sampler};
257+
return TextureSamplerDesc(newTexture, sampler);
258258
}
259259

260260

‎src/projectM-sdl/projectM_SDL_main.cpp‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,6 @@
1313
#define FAKE_AUDIO 0
1414

1515
#if OGL_DEBUG
16-
#include <GLES3/gl32.h>
17-
1816
void DebugLog(GLenum source,
1917
GLenum type,
2018
GLuint id,

0 commit comments

Comments
 (0)