From 443c1b83acbe96d35c577e2a7faba1adf07f7bec Mon Sep 17 00:00:00 2001 From: Mischa S Date: Sun, 19 Apr 2015 20:23:45 -0700 Subject: [PATCH] notes on converting to glES --- src/libprojectM/CMakeLists.txt | 9 +++- src/projectM-iTunes/gles_conv.txt | 48 +++++++++++++++++++ .../project.pbxproj | 2 + 3 files changed, 57 insertions(+), 2 deletions(-) create mode 100644 src/projectM-iTunes/gles_conv.txt diff --git a/src/libprojectM/CMakeLists.txt b/src/libprojectM/CMakeLists.txt index 8ec0c077e..2f6e2e4c7 100644 --- a/src/libprojectM/CMakeLists.txt +++ b/src/libprojectM/CMakeLists.txt @@ -52,11 +52,12 @@ endif (EMSCRIPTEN) if (APPLE) SET(USE_NATIVE_GLEW OFF) - SET(USE_FTGL ON) + SET(USE_FTGL OFF) SET(USE_OPENMP OFF) SET(BUILD_PROJECTM_STATIC ON) SET(USE_FBO ON) SET(USE_CG OFF) + SET(USE_GLES1 ON) endif(APPLE) ADD_DEFINITIONS(-DCMAKE_INSTALL_PREFIX=\"${CMAKE_INSTALL_PREFIX}\") @@ -152,7 +153,11 @@ if (APPLE) ADD_DEFINITIONS(-DMACOS -DSTBI_NO_DDS) set(RESOURCE_PREFIX "Resources") FIND_LIBRARY(COREFOUNDATION_LIBRARY CoreFoundation) - FIND_LIBRARY(OPENGL_LIBRARIES OpenGL) +# if (USE_GLES1) +# FIND_LIBRARY(OPENGL_LIBRARIES OpenGLES) +# else (USE_GLES1) + FIND_LIBRARY(OPENGL_LIBRARIES OpenGL) +# endif (USE_GLES1) else (APPLE) if (WIN32) set (RESOURCE_PREFIX "Resources") diff --git a/src/projectM-iTunes/gles_conv.txt b/src/projectM-iTunes/gles_conv.txt new file mode 100644 index 000000000..5e21fa0f3 --- /dev/null +++ b/src/projectM-iTunes/gles_conv.txt @@ -0,0 +1,48 @@ +./src/libprojectM/Renderer/FBO.cpp:116: glTexImage2D( GL_TEXTURE_2D, 0, GL_RGB, texsize, texsize, 0, GL_RGBA, GL_UNSIGNED_BYTE, NULL ); +./src/libprojectM/Renderer/FBO.cpp:120: glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP); +./src/libprojectM/Renderer/FBO.cpp:121: glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP); +./src/libprojectM/Renderer/FBO.cpp:128: glTexImage2D( GL_TEXTURE_2D, 0, GL_RGB, texsize, texsize, 0, GL_RGBA, GL_UNSIGNED_BYTE, NULL ); +./src/libprojectM/Renderer/FBO.cpp:131: glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP); +./src/libprojectM/Renderer/FBO.cpp:132: glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP); +./src/libprojectM/Renderer/FBO.cpp:172: glTexImage2D(GL_TEXTURE_2D, +./src/libprojectM/Renderer/FBO.cpp:213: glTexImage2D(GL_TEXTURE_2D, +./src/libprojectM/Renderer/FBO.cpp:75: glTexImage2D( GL_TEXTURE_2D, 0, GL_RGB, texsize, texsize, 0, GL_RGBA, GL_UNSIGNED_BYTE, NULL ); +./src/libprojectM/Renderer/FBO.cpp:77: glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP); +./src/libprojectM/Renderer/FBO.cpp:78: glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP); +./src/libprojectM/Renderer/Renderable.cpp:171: glColorPointer(4,GL_FLOAT,0,colors); +./src/libprojectM/Renderer/Renderable.cpp:230: glColorPointer(4,GL_FLOAT,0,colors); +./src/libprojectM/Renderer/Renderable.cpp:340: // glRect doesn't exist in GLES I think +./src/libprojectM/Renderer/Renderable.cpp:341: // TODO: replace glRect +./src/libprojectM/Renderer/Renderable.cpp:343: glRectd(of, of, of+iff, texof); +./src/libprojectM/Renderer/Renderable.cpp:344: glRectd(of+iff, of, texof-iff, of+iff); +./src/libprojectM/Renderer/Renderable.cpp:345: glRectd(texof-iff, of, texof, texof); +./src/libprojectM/Renderer/Renderable.cpp:346: glRectd(of+iff, texof, texof-iff, texof-iff); +./src/libprojectM/Renderer/Renderable.cpp:61: glColorPointer(4,GL_FLOAT,0,colors); +./src/libprojectM/Renderer/Renderer.cpp:310: glTexParameterf( GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE); +./src/libprojectM/Renderer/Renderer.cpp:311: glTexParameterf( GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE); +./src/libprojectM/Renderer/Renderer.cpp:313: glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP); +./src/libprojectM/Renderer/Renderer.cpp:314: glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP); +./src/libprojectM/Renderer/SOIL/SOIL.c:1259: glTexImage2D( +./src/libprojectM/Renderer/SOIL/SOIL.c:1263: check_for_GL_errors( "glTexImage2D" ); +./src/libprojectM/Renderer/SOIL/SOIL.c:1269: glTexImage2D( +./src/libprojectM/Renderer/SOIL/SOIL.c:1273: check_for_GL_errors( "glTexImage2D" ); +./src/libprojectM/Renderer/SOIL/SOIL.c:1318: glTexImage2D( +./src/libprojectM/Renderer/SOIL/SOIL.c:1322: check_for_GL_errors( "glTexImage2D" ); +./src/libprojectM/Renderer/SOIL/SOIL.c:1327: glTexImage2D( +./src/libprojectM/Renderer/SOIL/SOIL.c:1331: check_for_GL_errors( "glTexImage2D" ); +./src/libprojectM/Renderer/SOIL/SOIL.c:1364: unsigned int clamp_mode = GL_CLAMP; +./src/libprojectM/Renderer/SOIL/SOIL.c:1753: glTexImage2D( +./src/libprojectM/Renderer/SOIL/SOIL.c:1782: glTexImage2D( +./src/libprojectM/Renderer/SOIL/SOIL.c:1831: unsigned int clamp_mode = GL_CLAMP; +./src/libprojectM/Renderer/SOIL/SOIL.c:2019: glXGetProcAddressARB +./src/libprojectM/Renderer/ShaderEngine.cpp:107: glTexImage2D(GL_TEXTURE_2D, 0, 4, 512, 512, 0, GL_LUMINANCE, GL_FLOAT, noise.noise_perlin); +./src/libprojectM/Renderer/ShaderEngine.cpp:39: glTexImage2D(GL_TEXTURE_2D, 0, GL_RGB, texsize/2, texsize/2, 0, GL_RGBA, GL_UNSIGNED_BYTE, NULL ); +./src/libprojectM/Renderer/ShaderEngine.cpp:47: glTexImage2D(GL_TEXTURE_2D, 0, GL_RGB, texsize / 4, texsize / 4, 0, GL_RGBA, GL_UNSIGNED_BYTE, NULL ); +./src/libprojectM/Renderer/ShaderEngine.cpp:492: glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, texture->wrap ? GL_REPEAT : GL_CLAMP); +./src/libprojectM/Renderer/ShaderEngine.cpp:493: glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, texture->wrap ? GL_REPEAT : GL_CLAMP); +./src/libprojectM/Renderer/ShaderEngine.cpp:55: glTexImage2D(GL_TEXTURE_2D, 0, GL_RGB, texsize / 8, texsize / 8, 0, GL_RGBA, GL_UNSIGNED_BYTE, NULL ); +./src/libprojectM/Renderer/ShaderEngine.cpp:71: glTexImage2D(GL_TEXTURE_2D, 0, 4, 32, 32, 0, GL_LUMINANCE, GL_FLOAT, noise.noise_lq_lite); +./src/libprojectM/Renderer/ShaderEngine.cpp:80: glTexImage2D(GL_TEXTURE_2D, 0, 4, 256, 256, 0, GL_LUMINANCE, GL_FLOAT, noise.noise_lq); +./src/libprojectM/Renderer/ShaderEngine.cpp:89: glTexImage2D(GL_TEXTURE_2D, 0, 4, 256, 256, 0, GL_LUMINANCE, GL_FLOAT, noise.noise_mq); +./src/libprojectM/Renderer/ShaderEngine.cpp:98: glTexImage2D(GL_TEXTURE_2D, 0, 4, 256, 256, 0, GL_LUMINANCE, GL_FLOAT, noise.noise_hq); +./src/libprojectM/Renderer/Waveform.cpp:108: glColorPointer(4,GL_FLOAT,0,colors); diff --git a/src/projectM-iTunes/projectM Visualizer for iTunes.xcodeproj/project.pbxproj b/src/projectM-iTunes/projectM Visualizer for iTunes.xcodeproj/project.pbxproj index de298cc1d..3fd9d6290 100644 --- a/src/projectM-iTunes/projectM Visualizer for iTunes.xcodeproj/project.pbxproj +++ b/src/projectM-iTunes/projectM Visualizer for iTunes.xcodeproj/project.pbxproj @@ -119,6 +119,7 @@ C37EBD5C19A0146F00220265 /* images */ = {isa = PBXFileReference; lastKnownFileType = folder; name = images; path = ../images; sourceTree = ""; }; C37EBD5E19A0164400220265 /* selectViz.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = selectViz.png; path = images/selectViz.png; sourceTree = ""; }; C37EBD6019A01BEE00220265 /* projectM Visualizer.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.xml; path = "projectM Visualizer.entitlements"; sourceTree = ""; }; + C38212791A5A2114002A8D78 /* gles_conv.txt */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = gles_conv.txt; sourceTree = ""; }; C3C24434195764870021FCD4 /* libGLEW.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libGLEW.a; path = macos/contrib/libGLEW.a; sourceTree = ""; }; C3C2443D195770D70021FCD4 /* Cg.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Cg.framework; path = macos/contrib/Cg.framework; sourceTree = ""; }; C3F9D7AF17B82CC3009E58CB /* iProjectM.bundle */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = iProjectM.bundle; sourceTree = BUILT_PRODUCTS_DIR; }; @@ -213,6 +214,7 @@ C3F9D7A617B82CC3009E58CB = { isa = PBXGroup; children = ( + C38212791A5A2114002A8D78 /* gles_conv.txt */, C37EBD5E19A0164400220265 /* selectViz.png */, C37EBD5A19A0118600220265 /* iProjectM.pkg */, C3C2443D195770D70021FCD4 /* Cg.framework */,