diff mbox

[Branch,~glmark2-dev/glmark2/trunk] Rev 6: Remove built-in smooth shading functionality which is not available in OpenGL ES 2.0.

Message ID 20110721123630.17019.49258.launchpad@loganberry.canonical.com
State Accepted
Headers show

Commit Message

Alexandros Frantzis July 21, 2011, 12:36 p.m. UTC 
------------------------------------------------------------
revno: 6
committer: Alexandros Frantzis <alf82@freemail.gr>
timestamp: Wed 2010-07-07 15:42:25 +0300
message:
  Remove built-in smooth shading functionality which is not available in OpenGL ES 2.0.
modified:
  sceneshading.cpp


--
lp:glmark2
https://code.launchpad.net/~glmark2-dev/glmark2/trunk

You are subscribed to branch lp:glmark2.
To unsubscribe from this branch go to https://code.launchpad.net/~glmark2-dev/glmark2/trunk/+edit-subscription
diff mbox

Patch

=== modified file 'sceneshading.cpp'
--- sceneshading.cpp	2010-07-07 10:32:18 +0000
+++ sceneshading.cpp	2010-07-07 12:42:25 +0000
@@ -71,15 +71,11 @@ 
     {
     case 0:
         glDisable(GL_TEXTURE_2D);
-        glShadeModel(GL_SMOOTH);
+        mShader[0].use();
         break;
     case 1:
         glDisable(GL_TEXTURE_2D);
-       	mShader[0].use();
-        break;
-    case 2:
-        glDisable(GL_TEXTURE_2D);
-       	mShader[1].use();
+        mShader[1].use();
         break;
     };
     
@@ -105,12 +101,9 @@ 
         {
         case 0:
             printf("Shading\n");
-            printf("    Smooth shader model      FPS: %u\n", mAverageFPS[mCurrentPart]);
+            printf("    GLSL per vertex lighting FPS: %u\n", mAverageFPS[mCurrentPart]);
             break;
         case 1:
-            printf("    GLSL per vertex lighting FPS: %u\n", mAverageFPS[mCurrentPart]);
-            break;
-        case 2:
             printf("    GLSL per pixel lighting  FPS: %u\n", mAverageFPS[mCurrentPart]);
             break;
         }
@@ -135,6 +128,3 @@ 
 
     mMesh.render_vbo();
 }
-
-
-