summaryrefslogtreecommitdiff
path: root/opengl/libagl/primitives.cpp
diff options
context:
space:
mode:
author Mark Salyzyn <salyzyn@google.com> 2014-03-13 15:26:10 +0000
committer Android Git Automerger <android-git-automerger@android.com> 2014-03-13 15:26:10 +0000
commitd4dabf872ac0a12e12aebae9032f7d62762c2aeb (patch)
treea4c803ecda0a5ddb4655ba135e175d1f57f3d17c /opengl/libagl/primitives.cpp
parentffd353a73eb7794ef556c4e646f866b580a03abb (diff)
parentcdbf28b3f7f5327f4cb0eb95b8326bf4c24c87ba (diff)
am cdbf28b3: Merge "native frameworks: 64-bit compile issues"
* commit 'cdbf28b3f7f5327f4cb0eb95b8326bf4c24c87ba': native frameworks: 64-bit compile issues
Diffstat (limited to 'opengl/libagl/primitives.cpp')
-rw-r--r--opengl/libagl/primitives.cpp10
1 files changed, 5 insertions, 5 deletions
diff --git a/opengl/libagl/primitives.cpp b/opengl/libagl/primitives.cpp
index 769ec404a8..57a798deb3 100644
--- a/opengl/libagl/primitives.cpp
+++ b/opengl/libagl/primitives.cpp
@@ -94,7 +94,7 @@ static void lightTriangleDarkSmooth(ogles_context_t* c,
}
static void lightTriangleDarkFlat(ogles_context_t* c,
- vertex_t* v0, vertex_t* v1, vertex_t* v2)
+ vertex_t* /*v0*/, vertex_t* /*v1*/, vertex_t* v2)
{
if (!(v2->flags & vertex_t::LIT)) {
v2->flags |= vertex_t::LIT;
@@ -118,7 +118,7 @@ static void lightTriangleSmooth(ogles_context_t* c,
}
static void lightTriangleFlat(ogles_context_t* c,
- vertex_t* v0, vertex_t* v1, vertex_t* v2)
+ vertex_t* /*v0*/, vertex_t* /*v1*/, vertex_t* v2)
{
if (!(v2->flags & vertex_t::LIT))
c->lighting.lightVertex(c, v2);
@@ -567,8 +567,8 @@ void primitive_line(ogles_context_t* c, vertex_t* v0, vertex_t* v1)
#pragma mark Triangle
#endif
-void primitive_nop_triangle(ogles_context_t* c,
- vertex_t* v0, vertex_t* v1, vertex_t* v2) {
+void primitive_nop_triangle(ogles_context_t* /*c*/,
+ vertex_t* /*v0*/, vertex_t* /*v1*/, vertex_t* /*v2*/) {
}
void primitive_clip_triangle(ogles_context_t* c,
@@ -823,7 +823,7 @@ void lerp_texcoords_w(ogles_context_t* c,
static inline
-bool cull_triangle(ogles_context_t* c, vertex_t* v0, vertex_t* v1, vertex_t* v2)
+bool cull_triangle(ogles_context_t* c, vertex_t* /*v0*/, vertex_t* /*v1*/, vertex_t* /*v2*/)
{
if (ggl_likely(c->cull.enable)) {
const GLenum winding = (c->lerp.area() > 0) ? GL_CW : GL_CCW;