Merge branch 'master' into glsl-pp-rework-2

Conflicts:
	progs/perf/drawoverhead.c
	progs/perf/teximage.c
	progs/perf/vbo.c
	progs/perf/vertexrate.c
	src/mesa/shader/slang/library/slang_common_builtin_gc.h

1 files changed, 127 insertions, 15 deletions

diff --git a/progs/perf/glmain.c b/progs/perf/glmain.c
index 62d14259f8..69cdbce319 100644
--- a/progs/perf/glmain.c
+++ b/progs/perf/glmain.c
@@ -26,13 +26,13 @@
  */
 
 
+#include <stdio.h>
 #include "glmain.h"
 #include <GL/glut.h>
 
 
 static int Win;
 static GLfloat Xrot = 0, Yrot = 0, Zrot = 0;
-static GLboolean Anim = GL_FALSE;
 
 
 /** Return time in seconds */
@@ -50,13 +50,133 @@ PerfSwapBuffers(void)
 }
 
 
+/** make simple checkerboard texture object */
+GLuint
+PerfCheckerTexture(GLsizei width, GLsizei height)
+{
+   const GLenum filter = GL_NEAREST;
+   GLubyte *img = (GLubyte *) malloc(width * height * 4);
+   GLint i, j, k;
+   GLuint obj;
+
+   k = 0;
+   for (i = 0; i < height; i++) {
+      for (j = 0; j < width; j++) {
+         GLubyte color;
+         if (((i / 8) ^ (j / 8)) & 1) {
+            color = 0xff;
+         }
+         else {
+            color = 0x0;
+         }
+         img[k++] = color;
+         img[k++] = color;
+         img[k++] = color;
+         img[k++] = color;
+      }
+   }
+
+   glGenTextures(1, &obj);
+   glBindTexture(GL_TEXTURE_2D, obj);
+   glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, filter);
+   glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, filter);
+   glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA, width, height, 0,
+                GL_RGBA, GL_UNSIGNED_BYTE, img);
+   free(img);
+
+   return obj;
+}
+
+
+static GLuint
+CompileShader(GLenum type, const char *shader)
+{
+   GLuint sh;
+   GLint stat;
+
+   sh = glCreateShader(type);
+   glShaderSource(sh, 1, (const GLchar **) &shader, NULL);
+
+   glCompileShader(sh);
+      
+   glGetShaderiv(sh, GL_COMPILE_STATUS, &stat);
+   if (!stat) {
+      GLchar log[1000];
+      GLsizei len;
+      glGetShaderInfoLog(sh, 1000, &len, log);
+      fprintf(stderr, "Error: problem compiling shader: %s\n", log);
+      exit(1);
+   }
+
+   return sh;
+}
+
+
+/** Make shader program from given vert/frag shader text */
+GLuint
+PerfShaderProgram(const char *vertShader, const char *fragShader)
+{
+   GLuint prog;
+   GLint stat;
+
+   {
+      const char *version = (const char *) glGetString(GL_VERSION);
+      if ((version[0] != '2' && 
+           version[0] != '3') || version[1] != '.') {
+         fprintf(stderr, "Error: GL version 2.x or better required\n");
+         exit(1);
+      }
+   }
+
+   prog = glCreateProgram();
+
+   if (vertShader) {
+      GLuint vs = CompileShader(GL_VERTEX_SHADER, vertShader);
+      glAttachShader(prog, vs);
+   }
+   if (fragShader) {
+      GLuint fs = CompileShader(GL_FRAGMENT_SHADER, fragShader);
+      glAttachShader(prog, fs);
+   }
+
+   glLinkProgram(prog);
+   glGetProgramiv(prog, GL_LINK_STATUS, &stat);
+   if (!stat) {
+      GLchar log[1000];
+      GLsizei len;
+      glGetProgramInfoLog(prog, 1000, &len, log);
+      fprintf(stderr, "Shader link error:\n%s\n", log);
+      exit(1);
+   }
+
+   return prog;
+}
+
+
+int
+PerfReshapeWindow( unsigned w, unsigned h )
+{
+   if (glutGet(GLUT_SCREEN_WIDTH) < w ||
+       glutGet(GLUT_SCREEN_HEIGHT) < h)
+      return 0;
+
+   glutReshapeWindow( w, h );
+   glutPostRedisplay();
+   return 1;
+}
+
+
+GLboolean
+PerfExtensionSupported(const char *ext)
+{
+   return glutExtensionSupported(ext);
+}
+
+
 static void
 Idle(void)
 {
-   Xrot += 3.0;
-   Yrot += 4.0;
-   Zrot += 2.0;
-   glutPostRedisplay();
+   PerfNextRound();
 }
 
 
@@ -90,13 +210,6 @@ Key(unsigned char key, int x, int y)
    (void) x;
    (void) y;
    switch (key) {
-   case 'a':
-      Anim = !Anim;
-      if (Anim)
-         glutIdleFunc(Idle);
-      else
-         glutIdleFunc(NULL);
-      break;
    case 'z':
       Zrot -= step;
       break;
@@ -141,15 +254,14 @@ main(int argc, char *argv[])
 {
    glutInit(&argc, argv);
    glutInitWindowSize(WinWidth, WinHeight);
-   glutInitDisplayMode(GLUT_RGB | GLUT_DOUBLE | GLUT_DEPTH);
+   glutInitDisplayMode(GLUT_RGB | GLUT_DOUBLE | GLUT_DEPTH | GLUT_STENCIL);
    Win = glutCreateWindow(argv[0]);
    glewInit();
    glutReshapeFunc(Reshape);
    glutKeyboardFunc(Key);
    glutSpecialFunc(SpecialKey);
    glutDisplayFunc(Draw);
-   if (Anim)
-      glutIdleFunc(Idle);
+   glutIdleFunc(Idle);
    PerfInit();
    glutMainLoop();
    return 0;