diff --git a/platform/macosx/love.xcodeproj/project.pbxproj b/platform/macosx/love.xcodeproj/project.pbxproj
index 46e5383f7..d97e65b65 100644
--- a/platform/macosx/love.xcodeproj/project.pbxproj
+++ b/platform/macosx/love.xcodeproj/project.pbxproj
@@ -1686,6 +1686,7 @@
GCC_OPTIMIZATION_LEVEL = 0;
GCC_TREAT_IMPLICIT_FUNCTION_DECLARATIONS_AS_ERRORS = NO;
GCC_TREAT_NONCONFORMANT_CODE_ERRORS_AS_WARNINGS = NO;
+ GCC_VERSION = 4.0;
GCC_WARN_64_TO_32_BIT_CONVERSION = NO;
GCC_WARN_ABOUT_MISSING_NEWLINE = NO;
GCC_WARN_ABOUT_MISSING_PROTOTYPES = NO;
diff --git a/platform/msvc2008/graphics/graphics.vcproj b/platform/msvc2008/graphics/graphics.vcproj
index c1b489bc4..393b451e3 100644
--- a/platform/msvc2008/graphics/graphics.vcproj
+++ b/platform/msvc2008/graphics/graphics.vcproj
@@ -610,6 +610,14 @@
+
+
+
getVertices(), 4);
+ t.transform(v, v, 4);
- addv(t, v);
+ addv(v);
// Increment counter.
next++;
@@ -207,24 +207,18 @@ namespace opengl
glPopMatrix();
}
- void SpriteBatch::addv(const Matrix & t, const vertex * v)
+ void SpriteBatch::addv(const vertex * v)
{
- // Get a pointer to the correct insertion position.
- vertex * dst = vertices + next*4;
-
- // Transform.
- t.transform(dst, dst, 4);
-
if(lockp != 0)
{
// Copy into mapped memory if buffer is locked.
- memcpy(lockp + (next*4), dst, sizeof(vertex)*4);
+ memcpy(lockp + (next*4), v, sizeof(vertex)*4);
}
else
{
// ... use glBufferSubData otherwise.
glBindBuffer(GL_ARRAY_BUFFER, vbo[0]);
- glBufferSubData(GL_ARRAY_BUFFER, (next*4)*sizeof(vertex), sizeof(vertex)*4, dst);
+ glBufferSubData(GL_ARRAY_BUFFER, (next*4)*sizeof(vertex), sizeof(vertex)*4, v);
glBindBuffer(GL_ARRAY_BUFFER, 0);
}
}
diff --git a/src/modules/graphics/opengl/SpriteBatch.h b/src/modules/graphics/opengl/SpriteBatch.h
index 56f4bb223..6a92fb410 100644
--- a/src/modules/graphics/opengl/SpriteBatch.h
+++ b/src/modules/graphics/opengl/SpriteBatch.h
@@ -101,7 +101,7 @@ namespace opengl
private:
- void addv(const Matrix & t, const vertex * v);
+ void addv(const vertex * v);
}; // SpriteBatch