Mesa (mesa_7_6_branch): progs/glsl: Use C-style comments.

Vinson Lee vlee at kemper.freedesktop.org
Fri Dec 18 23:38:57 PST 2009


Module: Mesa
Branch: mesa_7_6_branch
Commit: 121ff55d81f3bff1c298ed84b2dc2d82fd572b0e
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=121ff55d81f3bff1c298ed84b2dc2d82fd572b0e

Author: Vinson Lee <vlee at vmware.com>
Date:   Fri Dec 18 23:38:15 2009 -0800

progs/glsl: Use C-style comments.

---

 progs/glsl/shtest.c    |    2 +-
 progs/glsl/texaaline.c |    4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/progs/glsl/shtest.c b/progs/glsl/shtest.c
index 628a7dd..88315d7 100644
--- a/progs/glsl/shtest.c
+++ b/progs/glsl/shtest.c
@@ -627,7 +627,7 @@ Init(void)
    NumAttribs = GetAttribs(Program, Attribs);
    PrintAttribs(Attribs);
 
-   //assert(glGetError() == 0);
+   /* assert(glGetError() == 0); */
 
    glClearColor(0.4f, 0.4f, 0.8f, 0.0f);
 
diff --git a/progs/glsl/texaaline.c b/progs/glsl/texaaline.c
index 2e4f932..00edab7 100644
--- a/progs/glsl/texaaline.c
+++ b/progs/glsl/texaaline.c
@@ -310,8 +310,8 @@ MakeMipmap(void)
    glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
    glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR_MIPMAP_LINEAR);
    glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
-   //glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAX_LOD, 4);
-   ////glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAX_LEVEL, 5);
+   /* glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAX_LOD, 4); */
+   /* glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAX_LEVEL, 5); */
 
    glTexEnvi(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
 #undef SZ



More information about the mesa-commit mailing list