ecere/gfx/drivers/OpenGL: Fixed extra parameters for GLAB::free()

- Also fixed warning on toggling swizzle off

diff --git a/ecere/src/gfx/drivers/OpenGLDisplayDriver.ec b/ecere/src/gfx/drivers/OpenGLDisplayDriver.ec
index 3af5390..7fe30da 100644 (file)
--- a/ecere/src/gfx/drivers/OpenGLDisplayDriver.ec
+++ b/ecere/src/gfx/drivers/OpenGLDisplayDriver.ec
@@ -3724,37 +3724,37 @@ class OpenGLDisplayDriver : DisplayDriver
          SETCAPS(oglSystem.capabilities);
          if(!mesh.flags.vertices)
          {
-            oglMesh.vertices.free(glCaps_vertexBuffer);
+            oglMesh.vertices.free();
             delete mesh.vertices;
          }
          if(!mesh.flags.normals)
          {
-            oglMesh.normals.free(glCaps_vertexBuffer);
+            oglMesh.normals.free();
             delete mesh.normals;
          }
          if(!mesh.flags.tangents)
          {
-            oglMesh.tangents.free(glCaps_vertexBuffer);
+            oglMesh.tangents.free();
             delete mesh.tangents;
          }
          if(!mesh.flags.lightVectors)
          {
-            oglMesh.lightVectors.free(glCaps_vertexBuffer);
+            oglMesh.lightVectors.free();
             delete mesh.lightVectors;
          }
          if(!mesh.flags.texCoords1)
          {
-            oglMesh.texCoords.free(glCaps_vertexBuffer);
+            oglMesh.texCoords.free();
             delete mesh.texCoords;
          }
          if(!mesh.flags.texCoords2)
          {
-            oglMesh.texCoords2.free(glCaps_vertexBuffer);
+            oglMesh.texCoords2.free();
             // delete mesh.texCoords2;
          }
          if(!mesh.flags.colors)
          {
-            oglMesh.colors.free(glCaps_vertexBuffer);
+            oglMesh.colors.free();
             delete mesh.colors;
          }
          if(!mesh.flags)
@@ -3903,7 +3903,7 @@ class OpenGLDisplayDriver : DisplayDriver
       SETCAPS(oglSystem.capabilities);
       if(oglIndices)
       {
-         oglIndices.buffer.free(glCaps_vertexBuffer);
+         oglIndices.buffer.free();
          delete oglIndices.indices;
          delete oglIndices;
       }

diff --git a/ecere/src/gfx/drivers/gl3/defaultShader.ec b/ecere/src/gfx/drivers/gl3/defaultShader.ec
index b44b3b4..ca968e1 100644 (file)
--- a/ecere/src/gfx/drivers/gl3/defaultShader.ec
+++ b/ecere/src/gfx/drivers/gl3/defaultShader.ec
@@ -568,7 +568,7 @@ public:
    void swizzle(SwizzleMode swizzle)
    {
 #ifdef _DEBUG
-      if(!((DefaultShaderBits)state).texturing && !((DefaultShaderBits)state).cubeMap)
+      if(swizzle && !((DefaultShaderBits)state).texturing && !((DefaultShaderBits)state).cubeMap)
          printf("swizzle() with texturing off\n");
 #endif
       if(((DefaultShaderBits)state).swizzle != swizzle)

diff --git a/ecere/src/gfx/drivers/gl3/gl123es.h b/ecere/src/gfx/drivers/gl3/gl123es.h
index 5083e56..57458fd 100644 (file)
--- a/ecere/src/gfx/drivers/gl3/gl123es.h
+++ b/ecere/src/gfx/drivers/gl3/gl123es.h
@@ -71,7 +71,7 @@
    #define GL_TEXTURE_CUBE_MAP_NEGATIVE_Z    GL_TEXTURE_CUBE_MAP_NEGATIVE_Z_OES
    #define GL_REFLECTION_MAP                 GL_REFLECTION_MAP_OES
    #define GL_TEXTURE_GEN_MODE               GL_TEXTURE_GEN_MODE_OES
-   #define GL_TEXTURE_GEN_STR                GL_TEXTURE_GEN_STR_OES 
+   #define GL_TEXTURE_GEN_STR                GL_TEXTURE_GEN_STR_OES
 
    #define glTexGeni    glTexGeniOES
    #define glTexGenfv   glTexGenfvOES