CMakeLists.txt | 18 configure.ac | 28 - debian/changelog | 9 debian/control | 1 debian/copyright | 87 +--- src/demos/fbo_firecube.c | 3 src/demos/fire.c | 1 src/demos/teapot.c | 1 src/demos/terrain.c | 1 src/demos/trispd.c | 1 src/demos/tunnel.c | 1 src/demos/tunnel2.c | 1 src/egl/eglut/CMakeLists.txt | 6 src/egl/eglut/Makefile.am | 10 src/egl/eglut/eglut.c | 8 src/egl/eglut/eglut_screen.c | 180 --------- src/egl/opengl/.gitignore | 6 src/egl/opengl/CMakeLists.txt | 17 src/egl/opengl/Makefile.am | 11 src/egl/opengl/demo1.c | 147 ------- src/egl/opengl/demo2.c | 216 ----------- src/egl/opengl/demo3.c | 647 ----------------------------------- src/egl/opengl/eglinfo.c | 51 -- src/egl/opengl/eglscreen.c | 120 ------ src/egl/opengles1/.gitignore | 4 src/egl/opengles1/CMakeLists.txt | 4 src/egl/opengles1/Makefile.am | 14 src/egl/opengles1/torus.c | 5 src/egl/opengles2/.gitignore | 1 src/egl/opengles2/CMakeLists.txt | 4 src/egl/opengles2/Makefile.am | 10 src/egl/opengles2/es2tri.c | 2 src/egl/openvg/.gitignore | 2 src/egl/openvg/CMakeLists.txt | 4 src/egl/openvg/Makefile.am | 8 src/fp/fp-tri.c | 8 src/glsl/geom-stipple-lines.c | 59 ++- src/glsl/geom-wide-lines.c | 60 ++- src/tests/.gitignore | 1 src/tests/CMakeLists.txt | 1 src/tests/Makefile.am | 1 src/tests/arbfpspec.c | 14 src/tests/arbfptest1.c | 8 src/tests/arbvptest1.c | 8 src/tests/arbvptest3.c | 8 src/tests/arbvptorus.c | 8 src/tests/arbvpwarpmesh.c | 8 src/tests/line-sample.c | 206 +++++++++++ src/tests/rubberband.c | 34 + src/trivial/.gitignore | 1 src/trivial/CMakeLists.txt | 1 src/trivial/Makefile.am | 1 src/trivial/draw2arrays.c | 8 src/trivial/drawarrays.c | 8 src/trivial/drawelements-large.c | 8 src/trivial/drawelements.c | 8 src/trivial/drawrange.c | 8 src/trivial/lineloop-elts.c | 8 src/trivial/quad-offset-unfilled.c | 2 src/trivial/tri-array-interleaved.c | 8 src/trivial/tri-fp-const-imm.c | 8 src/trivial/tri-fp.c | 8 src/trivial/tri-tex-stipple.c | 120 ++++++ src/trivial/vbo-drawarrays-2101010.c | 6 src/trivial/vbo-drawarrays.c | 8 src/trivial/vbo-drawelements.c | 8 src/trivial/vbo-drawrange.c | 8 src/trivial/vbo-noninterleaved.c | 8 src/trivial/vbo-tri.c | 8 src/trivial/vp-array-hf.c | 8 src/trivial/vp-array-int.c | 8 src/trivial/vp-array.c | 8 src/trivial/vp-clip.c | 8 src/trivial/vp-line-clip.c | 8 src/trivial/vp-tri-cb-pos.c | 8 src/trivial/vp-tri-cb-tex.c | 8 src/trivial/vp-tri-cb.c | 8 src/trivial/vp-tri-imm.c | 8 src/trivial/vp-tri-invariant.c | 8 src/trivial/vp-tri-swap.c | 8 src/trivial/vp-tri-tex.c | 8 src/trivial/vp-tri.c | 8 src/trivial/vp-unfilled.c | 8 src/util/README | 1 src/util/glstate.c | 502 --------------------------- src/util/glstate.h | 51 -- src/util/shaderutil.c | 1 src/vp/vp-tris.c | 8 src/wgl/sharedtex_mt.c | 8 src/wgl/wglinfo.c | 446 ++++++++++++++++-------- src/wgl/wglthreads.c | 5 src/xdemos/.gitignore | 1 src/xdemos/CMakeLists.txt | 3 src/xdemos/Makefile.am | 6 src/xdemos/corender.c | 400 --------------------- src/xdemos/glinfo_common.c | 82 ++++ src/xdemos/glinfo_common.h | 53 ++ src/xdemos/glxgears_pixmap.c | 2 src/xdemos/glxinfo.c | 231 +++++------- src/xdemos/ipc.c | 264 -------------- src/xdemos/ipc.h | 16 src/xdemos/sharedtex_mt.c | 7 102 files changed, 1254 insertions(+), 3241 deletions(-)
New commits: commit 45b1ca5472e6c136d1d35c99afd895362dcd91b3 Author: Andreas Boll <[email protected]> Date: Thu Dec 10 13:28:00 2015 +0100 Update debian/copyright from mesa's docs/license.html and remove the unused LGPL (src/util/glstate.[ch] got removed upstream). diff --git a/debian/changelog b/debian/changelog index e26d9d4..2e964ad 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,6 +2,8 @@ mesa-demos (8.3.0-1) UNRELEASED; urgency=medium * New upstream release. * Remove duplicated field "Priority" from package mesa-utils-extra. + * Update debian/copyright from mesa's docs/license.html and remove the + unused LGPL (src/util/glstate.[ch] got removed upstream). -- Andreas Boll <[email protected]> Thu, 10 Dec 2015 13:08:32 +0100 diff --git a/debian/copyright b/debian/copyright index ae2a6c6..eef8acf 100644 --- a/debian/copyright +++ b/debian/copyright @@ -7,52 +7,43 @@ For more information see: http://www.mesa3d.org/ -Upstream Author: Brian Paul <[email protected]> and others +------------------------------------------------------------------------------- +The Mesa distribution consists of several components. Different copyrights and +licenses apply to different components. For example, some demo programs are +copyrighted by SGI, some of the Mesa device drivers are copyrighted by their +authors. See below for a list of Mesa's main components and the license for +each. +The core Mesa library is licensed according to the terms of the MIT license. +This allows integration with the XFree86, Xorg and DRI projects. - License / Copyright Information +The default Mesa license is as follows: - The Mesa distribution consists of several components. Different - copyrights and licenses apply to different components. For - example, GLUT is copyrighted by Mark Kilgard, some demo programs - are copyrighted by SGI, some of the Mesa device drivers are - copyrighted by their authors. See below for a list of Mesa's - components and the copyright/license for each. +Copyright (C) 1999-2007 Brian Paul All Rights Reserved. - The core Mesa library is licensed according to the terms of the - XFree86 copyright (an MIT-style license). This allows integration - with the XFree86/DRI project. Unless otherwise stated, the Mesa - source code and documentation is licensed as follows: +Permission is hereby granted, free of charge, to any person obtaining a +copy of this software and associated documentation files (the "Software"), +to deal in the Software without restriction, including without limitation +the rights to use, copy, modify, merge, publish, distribute, sublicense, +and/or sell copies of the Software, and to permit persons to whom the +Software is furnished to do so, subject to the following conditions: - Copyright (C) 1999-2008 Brian Paul All Rights Reserved. +The above copyright notice and this permission notice shall be included +in all copies or substantial portions of the Software. - Permission is hereby granted, free of charge, to any person obtaining a - copy of this software and associated documentation files (the "Software"), - to deal in the Software without restriction, including without limitation - the rights to use, copy, modify, merge, publish, distribute, sublicense, - and/or sell copies of the Software, and to permit persons to whom the - Software is furnished to do so, subject to the following conditions: +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS +OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL +THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +SOFTWARE. - The above copyright notice and this permission notice shall be included - in all copies or substantial portions of the Software. +Attention, Contributors - THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS - OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL - BRIAN PAUL BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN - AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN - CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - - Attention, Contributors - - When contributing to the Mesa project you must agree to relinquish - your work to the holder of the copyright for the particular - component you're contributing to. That is, you can't put your own - copyright on the code, unless it's a modular piece that can be - omitted from Mesa (like a new device driver). If for example, you - contribute a bug fix to Mesa's texture mapping code, your code - will become a part of the body of work which is copyrighted by - Brian Paul and licensed by the above terms. +When contributing to the Mesa project you must agree to the licensing terms of +the component to which you're contributing. The following section lists the +primary components of the Mesa distribution and their respective licenses. ---------------------------------------------------------------------- @@ -140,26 +131,6 @@ src/glsl/vsraytrace.c, src/glsl/fsraytrace.c: FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. -src/util/glstate.[ch]: - Copyright (C) 1998 Brian Paul - - This library is free software; you can redistribute it and/or - modify it under the terms of the GNU Library General Public - License as published by the Free Software Foundation; either - version 2 of the License, or (at your option) any later version. - - This library is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - Library General Public License for more details. - - You should have received a copy of the GNU Library General Public - License along with this library; if not, write to the Free - Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - - On Debian systems the full text of the GNU LGPL license is found in - /usr/share/common-licenses/LGPL. - src/tests/api_speed.c: (C) Copyright IBM Corporation 2002 src/tests/api_speed.py, src/tests/no_s3tc.c: commit ed6d29a74c8853d9ae5aae14ebd0440e266df3ec Author: Andreas Boll <[email protected]> Date: Thu Dec 10 13:11:06 2015 +0100 Remove duplicated field "Priority" from package mesa-utils-extra. diff --git a/debian/changelog b/debian/changelog index fe9f4ff..e26d9d4 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,7 @@ mesa-demos (8.3.0-1) UNRELEASED; urgency=medium * New upstream release. + * Remove duplicated field "Priority" from package mesa-utils-extra. -- Andreas Boll <[email protected]> Thu, 10 Dec 2015 13:08:32 +0100 diff --git a/debian/control b/debian/control index 9bb66f2..aa0eacf 100644 --- a/debian/control +++ b/debian/control @@ -34,7 +34,6 @@ Description: Miscellaneous Mesa GL utilities Package: mesa-utils-extra Section: x11 -Priority: optional Architecture: linux-any kfreebsd-any Depends: ${shlibs:Depends}, commit cf8b6e831653507aa6d2370987068a317c3690b4 Author: Andreas Boll <[email protected]> Date: Thu Dec 10 13:08:47 2015 +0100 Bump changelog diff --git a/debian/changelog b/debian/changelog index c7dab2a..fe9f4ff 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +mesa-demos (8.3.0-1) UNRELEASED; urgency=medium + + * New upstream release. + + -- Andreas Boll <[email protected]> Thu, 10 Dec 2015 13:08:32 +0100 + mesa-demos (8.2.0-3) unstable; urgency=medium * Run quilt before autoreconf, should fix FTBFS on kfreebsd-i386. commit 0a8779daf6d651f3264dfe0168e92ab2c61a9a67 Author: Andreas Boll <[email protected]> Date: Wed Dec 9 22:18:36 2015 +0100 demos: Bump version to 8.3.0 for release Signed-off-by: Andreas Boll <[email protected]> diff --git a/CMakeLists.txt b/CMakeLists.txt index 57a46f8..fc1caa0 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -162,7 +162,7 @@ install (FILES index.html DESTINATION doc) set (CPACK_PACKAGE_NAME "mesa-demos") set (CPACK_PACKAGE_VERSION_MAJOR "8") -set (CPACK_PACKAGE_VERSION_MINOR "2") +set (CPACK_PACKAGE_VERSION_MINOR "3") set (CPACK_PACKAGE_VERSION_PATCH "0") if (WIN32) diff --git a/configure.ac b/configure.ac index 9445424..0525b09 100644 --- a/configure.ac +++ b/configure.ac @@ -25,7 +25,7 @@ dnl Process this file with autoconf to create configure. AC_PREREQ([2.59]) -AC_INIT([mesa-demos], [8.2.0], +AC_INIT([mesa-demos], [8.3.0], [https://bugs.freedesktop.org/enter_bug.cgi?product=Mesa&component=Demos]) AC_CANONICAL_HOST commit b9b7312dacece4400e188ea8d51ae8314c79c999 Author: Andreas Boll <[email protected]> Date: Mon Dec 7 19:58:53 2015 +0100 util: Remove unused glstate.[ch] Unused and not built for years. Signed-off-by: Andreas Boll <[email protected]> Reviewed-by: Brian Paul <[email protected]> diff --git a/src/util/README b/src/util/README index ea71ebd..d814aa5 100644 --- a/src/util/README +++ b/src/util/README @@ -10,7 +10,6 @@ mwmborder.c - remove Motif window decoration/border winpos.c - set absolute window raster position readtex.c - load textures/mipmaps from an .rgb file showbuffer.[ch] - show depth, alpha, or stencil buffer contents -glstate.[ch] - query/print GL state variables, for debugging, etc. sampleMakefile - example Makefile for making OpenGL/Mesa apps on Unix dumpsate.c - dump all OpenGL state, from Stephane Rehel imagesgi.cpp,.h - read SGI image files diff --git a/src/util/glstate.c b/src/util/glstate.c deleted file mode 100644 index 18e612b..0000000 --- a/src/util/glstate.c +++ /dev/null @@ -1,502 +0,0 @@ - -/* - * Print GL state information (for debugging) - * Copyright (C) 1998 Brian Paul - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Library General Public - * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Library General Public License for more details. - * - * You should have received a copy of the GNU Library General Public - * License along with this library; if not, write to the Free - * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - */ - - -/* - * Revision 1.1 1999/08/19 00:55:42 jtg - * Initial revision - * - * Revision 1.4 1999/06/19 01:36:43 brianp - * more features added - * - * Revision 1.3 1999/02/24 05:16:20 brianp - * added still more records to EnumTable - * - * Revision 1.2 1998/11/24 03:47:54 brianp - * added more records to EnumTable - * - * Revision 1.1 1998/11/24 03:41:16 brianp - * Initial revision - * - */ - - - -#include <assert.h> -#include "gl_wrap.h" -#include <stdio.h> -#include <stdlib.h> -#include "glstate.h" - - -#define FLOAT 1 -#define INT 2 -#define DOUBLE 3 -#define BOOLEAN 4 -#define ENUM 5 -#define VOID 6 -#define LAST_TOKEN ~0 - - -struct EnumRecord { - GLenum enumerator; /* GLenum constant */ - const char *string; /* string name */ - int getType; /* INT, FLOAT, DOUBLE, BOOLEAN, ENUM, or VOID */ - int getCount; /* number of values returned by the glGet*v() call */ -}; - - -/* XXX Lots more records to add here! Help, anyone? */ - -static struct EnumRecord EnumTable[] = { - { GL_ACCUM_RED_BITS, "GL_ACCUM_RED_BITS", INT, 1 }, - { GL_ACCUM_GREEN_BITS, "GL_ACCUM_GREEN_BITS", INT, 1 }, - { GL_ACCUM_BLUE_BITS, "GL_ACCUM_BLUE_BITS", INT, 1 }, - { GL_ACCUM_ALPHA_BITS, "GL_ACCUM_ALPHA_BITS", INT, 1 }, - { GL_ACCUM_CLEAR_VALUE, "GL_ACCUM_CLEAR_VALUE", FLOAT, 4 }, - { GL_ALPHA_BIAS, "GL_ALPHA_BIAS", FLOAT, 1 }, - { GL_ALPHA_BITS, "GL_ALPHA_BITS", INT, 1 }, - { GL_ALPHA_SCALE, "GL_ALPHA_SCALE", FLOAT, 1 }, - { GL_ALPHA_TEST, "GL_ALPHA_TEST", BOOLEAN, 1 }, - { GL_ALPHA_TEST_FUNC, "GL_ALPHA_TEST_FUNC", ENUM, 1 }, - { GL_ALWAYS, "GL_ALWAYS", ENUM, 0 }, - { GL_ALPHA_TEST_REF, "GL_ALPHA_TEST_REF", FLOAT, 1 }, - { GL_ATTRIB_STACK_DEPTH, "GL_ATTRIB_STACK_DEPTH", INT, 1 }, - { GL_AUTO_NORMAL, "GL_AUTO_NORMAL", BOOLEAN, 1 }, - { GL_AUX_BUFFERS, "GL_AUX_BUFFERS", INT, 1 }, - { GL_BLEND, "GL_BLEND", BOOLEAN, 1 }, - { GL_BLEND_DST, "GL_BLEND_DST", ENUM, 1 }, - { GL_BLEND_SRC, "GL_BLEND_SRC", ENUM, 1 }, - { GL_BLUE_BIAS, "GL_BLUE_BIAS", FLOAT, 1 }, - { GL_BLUE_BITS, "GL_BLUE_BITS", INT, 1 }, - { GL_BLUE_SCALE, "GL_BLUE_SCALE", FLOAT, 1 }, - - { GL_CLAMP_TO_EDGE, "GL_CLAMP_TO_EDGE", ENUM, 0 }, - { GL_CLEAR, "GL_CLEAR", ENUM, 0 }, - { GL_CLIENT_ATTRIB_STACK_DEPTH, "GL_CLIENT_ATTRIB_STACK_DEPTH", INT, 1 }, - { GL_CLIP_PLANE0, "GL_CLIP_PLANE0", BOOLEAN, 1 }, - { GL_CLIP_PLANE1, "GL_CLIP_PLANE1", BOOLEAN, 1 }, - { GL_CLIP_PLANE2, "GL_CLIP_PLANE2", BOOLEAN, 1 }, - { GL_CLIP_PLANE3, "GL_CLIP_PLANE3", BOOLEAN, 1 }, - { GL_CLIP_PLANE4, "GL_CLIP_PLANE4", BOOLEAN, 1 }, - { GL_CLIP_PLANE5, "GL_CLIP_PLANE5", BOOLEAN, 1 }, - { GL_COEFF, "GL_COEEF", ENUM, 0 }, - { GL_COLOR, "GL_COLOR", ENUM, 0 }, - { GL_COLOR_BUFFER_BIT, "GL_COLOR_BUFFER_BIT", ENUM, 0 }, - { GL_COLOR_CLEAR_VALUE, "GL_COLOR_CLEAR_VALUE", FLOAT, 4 }, - { GL_COLOR_INDEX, "GL_COLOR_INDEX", ENUM, 0 }, - { GL_COLOR_MATERIAL, "GL_COLOR_MATERIAL", BOOLEAN, 1 }, - { GL_COLOR_MATERIAL_FACE, "GL_COLOR_MATERIAL_FACE", ENUM, 1 }, - { GL_COLOR_MATERIAL_PARAMETER, "GL_COLOR_MATERIAL_PARAMETER", ENUM, 1 }, - { GL_COLOR_WRITEMASK, "GL_COLOR_WRITEMASK", BOOLEAN, 4 }, - { GL_COMPILE, "GL_COMPILE", ENUM, 0 }, - { GL_COMPILE_AND_EXECUTE, "GL_COMPILE_AND_EXECUTE", ENUM, 0 }, - { GL_COPY, "GL_COPY", ENUM, 0 }, - { GL_COPY_INVERTED, "GL_COPY_INVERTED", ENUM, 0 }, - { GL_COPY_PIXEL_TOKEN, "GL_COPY_PIXEL_TOKEN", ENUM, 0 }, - { GL_CULL_FACE, "GL_CULL_FACE", BOOLEAN, 1 }, - { GL_CULL_FACE_MODE, "GL_CULL_FACE_MODE", ENUM, 1 }, - { GL_CURRENT_BIT, "GL_CURRENT_BIT", ENUM, 0 }, - { GL_CURRENT_COLOR, "GL_CURRENT_COLOR", FLOAT, 4 }, - { GL_CURRENT_INDEX, "GL_CURRENT_INDEX", INT, 1 }, - { GL_CURRENT_NORMAL, "GL_CURRENT_NORMAL", FLOAT, 3 }, - { GL_CURRENT_RASTER_COLOR, "GL_CURRENT_RASTER_COLOR", FLOAT, 4 }, - { GL_CURRENT_RASTER_DISTANCE, "GL_CURRENT_RASTER_DISTANCE", FLOAT, 1 }, - { GL_CURRENT_RASTER_INDEX, "GL_CURRENT_RASTER_INDEX", INT, 1 }, - { GL_CURRENT_RASTER_POSITION, "GL_CURRENT_RASTER_POSITION", FLOAT, 4 }, - { GL_CURRENT_RASTER_TEXTURE_COORDS, "GL_CURRENT_RASTER_TEXTURE_COORDS", FLOAT, 4 }, - { GL_CURRENT_RASTER_POSITION_VALID, "GL_CURRENT_RASTER_POSITION_VALID", BOOLEAN, 1 }, - { GL_CURRENT_TEXTURE_COORDS, "GL_CURRENT_TEXTURE_COORDS", FLOAT, 4 }, - { GL_CW, "GL_CW", ENUM, 0 }, - { GL_CCW, "GL_CCW", ENUM, 0 }, - - { GL_DECAL, "GL_DECAL", ENUM, 0 }, - { GL_DECR, "GL_DECR", ENUM, 0 }, - { GL_DEPTH, "GL_DEPTH", ENUM, 0 }, - { GL_DEPTH_BIAS, "GL_DEPTH_BIAS", FLOAT, 1 }, - { GL_DEPTH_BITS, "GL_DEPTH_BITS", INT, 1 }, - { GL_DEPTH_BUFFER_BIT, "GL_DEPTH_BUFFER_BIT", ENUM, 0 }, - { GL_DEPTH_CLEAR_VALUE, "GL_DEPTH_CLEAR_VALUE", FLOAT, 1 }, - { GL_DEPTH_COMPONENT, "GL_DEPTH_COMPONENT", ENUM, 0 }, - { GL_DEPTH_FUNC, "GL_DEPTH_FUNC", ENUM, 1 }, - { GL_DEPTH_RANGE, "GL_DEPTH_RANGE", FLOAT, 2 }, - { GL_DEPTH_SCALE, "GL_DEPTH_SCALE", FLOAT, 1 }, - { GL_DEPTH_TEST, "GL_DEPTH_TEST", ENUM, 1 }, - { GL_DEPTH_WRITEMASK, "GL_DEPTH_WRITEMASK", BOOLEAN, 1 }, - { GL_DIFFUSE, "GL_DIFFUSE", ENUM, 0 }, /*XXX*/ - { GL_DITHER, "GL_DITHER", BOOLEAN, 1 }, - { GL_DOMAIN, "GL_DOMAIN", ENUM, 0 }, - { GL_DONT_CARE, "GL_DONT_CARE", ENUM, 0 }, - { GL_DOUBLE, "GL_DOUBLE", ENUM, 0 }, - { GL_DOUBLEBUFFER, "GL_DOUBLEBUFFER", BOOLEAN, 1}, - { GL_DRAW_BUFFER, "GL_DRAW_BUFFER", ENUM, 1 }, - { GL_DRAW_PIXEL_TOKEN, "GL_DRAW_PIXEL_TOKEN", ENUM, 0 }, - { GL_DST_ALPHA, "GL_DST_ALPHA", ENUM, 0 }, - { GL_DST_COLOR, "GL_DST_COLOR", ENUM, 0 }, - - { GL_EDGE_FLAG, "GL_EDGE_FLAG", BOOLEAN, 1 }, - /* XXX GL_EDGE_FLAG_ARRAY_* */ - { GL_EMISSION, "GL_EMISSION", ENUM, 0 }, /* XXX */ - { GL_ENABLE_BIT, "GL_ENABLE_BIT", ENUM, 0 }, - { GL_EQUAL, "GL_EQUAL", ENUM, 0 }, - { GL_EQUIV, "GL_EQUIV", ENUM, 0 }, - { GL_EVAL_BIT, "GL_EVAL_BIT", ENUM, 0 }, - { GL_EXP, "GL_EXP", ENUM, 0 }, - { GL_EXP2, "GL_EXP2", ENUM, 0 }, - { GL_EXTENSIONS, "GL_EXTENSIONS", ENUM, 0 }, - { GL_EYE_LINEAR, "GL_EYE_LINEAR", ENUM, 0 }, - { GL_EYE_PLANE, "GL_EYE_PLANE", ENUM, 0 }, - - { GL_FALSE, "GL_FALSE", ENUM, 0 }, - { GL_FASTEST, "GL_FASTEST", ENUM, 0 }, - { GL_FEEDBACK, "GL_FEEDBACK", ENUM, 0 }, - { GL_FEEDBACK_BUFFER_POINTER, "GL_FEEDBACK_BUFFER_POINTER", VOID, 0 }, - { GL_FEEDBACK_BUFFER_SIZE, "GL_FEEDBACK_BUFFER_SIZE", INT, 1 }, - { GL_FEEDBACK_BUFFER_TYPE, "GL_FEEDBACK_BUFFER_TYPE", INT, 1 }, - { GL_FILL, "GL_FILL", ENUM, 0 }, - { GL_FLAT, "GL_FLAT", ENUM, 0 }, - { GL_FLOAT, "GL_FLOAT", ENUM, 0 }, - { GL_FOG, "GL_FOG", BOOLEAN, 1 }, - { GL_FOG_BIT, "GL_FOG_BIT", ENUM, 0 }, - { GL_FOG_COLOR, "GL_FOG_COLOR", FLOAT, 4 }, - { GL_FOG_DENSITY, "GL_FOG_DENSITY", FLOAT, 1 }, - { GL_FOG_END, "GL_FOG_END", FLOAT, 1 }, - { GL_FOG_HINT, "GL_FOG_HINT", ENUM, 1 }, - { GL_FOG_INDEX, "GL_FOG_INDEX", INT, 1 }, - { GL_FOG_MODE, "GL_FOG_MODE", ENUM, 1 }, - { GL_FOG_START, "GL_FOG_START", FLOAT, 1 }, - { GL_FRONT, "GL_FRONT", ENUM, 0 }, - { GL_FRONT_AND_BACK, "GL_FRONT_AND_BACK", ENUM, 0 }, - { GL_FRONT_FACE, "GL_FRONT_FACE", ENUM, 1 }, - { GL_FRONT_LEFT, "GL_FRONT_LEFT", ENUM, 0 }, - { GL_FRONT_RIGHT, "GL_FRONT_RIGHT", ENUM, 0 }, - - { GL_GEQUAL, "GL_GEQUAL", ENUM, 0 }, - { GL_GREATER, "GL_GREATER", ENUM, 0 }, - { GL_GREEN, "GL_GREEN", ENUM, 0 }, - { GL_GREEN_BIAS, "GL_GREEN_BIAS", FLOAT, 1 }, - { GL_GREEN_BITS, "GL_GREEN_BITS", INT, 1 }, - { GL_GREEN_SCALE, "GL_GREEN_SCALE", FLOAT, 1 }, - - - - { GL_LESS, "GL_LESS", ENUM, 0 }, - { GL_LEQUAL, "GL_LEQUAL", ENUM, 0 }, - { GL_LIGHTING, "GL_LIGHTING", BOOLEAN, 1 }, - { GL_LINE_SMOOTH, "GL_LINE_SMOOTH", BOOLEAN, 1 }, - { GL_LINE_STIPPLE, "GL_LINE_STIPPLE", BOOLEAN, 1 }, - { GL_LINE_STIPPLE_PATTERN, "GL_LINE_STIPPLE_PATTERN", INT, 1 }, - { GL_LINE_STIPPLE_REPEAT, "GL_LINE_STIPPLE_REPEAT", INT, 1 }, - { GL_LINE_WIDTH, "GL_LINE_WIDTH", FLOAT, 1 }, - - { GL_MODELVIEW_MATRIX, "GL_MODELVIEW_MATRIX", DOUBLE, 16 }, - - { GL_NEVER, "GL_NEVER", ENUM, 0 }, - { GL_NOTEQUAL, "GL_NOTEQUAL", ENUM, 0 }, - - { GL_PROJECTION_MATRIX, "GL_PROJECTION_MATRIX", FLOAT, 16 }, - - { GL_PACK_SWAP_BYTES, "GL_PACK_SWAP_BYTES", INT, 1 }, - { GL_PACK_LSB_FIRST, "GL_PACK_LSB_FIRST", INT, 1 }, - { GL_PACK_ROW_LENGTH, "GL_PACK_ROW_LENGTH", INT, 1 }, - { GL_PACK_SKIP_PIXELS, "GL_PACK_SKIP_PIXELS", INT, 1 }, - { GL_PACK_SKIP_ROWS, "GL_PACK_SKIP_ROWS", INT, 1 }, - { GL_PACK_ALIGNMENT, "GL_PACK_ALIGNMENT", INT, 1 }, - - { GL_TRUE, "GL_TRUE", ENUM, 0 }, - - { GL_UNPACK_SWAP_BYTES, "GL_UNPACK_SWAP_BYTES", INT, 1 }, - { GL_UNPACK_LSB_FIRST, "GL_UNPACK_LSB_FIRST", INT, 1 }, - { GL_UNPACK_ROW_LENGTH, "GL_UNPACK_ROW_LENGTH", INT, 1 }, - { GL_UNPACK_SKIP_PIXELS, "GL_UNPACK_SKIP_PIXELS", INT, 1 }, - { GL_UNPACK_SKIP_ROWS, "GL_UNPACK_SKIP_ROWS", INT, 1 }, - { GL_UNPACK_ALIGNMENT, "GL_UNPACK_ALIGNMENT", INT, 1 }, - - { GL_VIEWPORT, "GL_VIEWPORT", INT, 4 }, - - - /* - * Extensions - */ - -#if defined(GL_EXT_blend_minmax) - { GL_BLEND_EQUATION_EXT, "GL_BLEND_EQUATION_EXT", ENUM, 1 }, -#endif -#if defined(GL_EXT_blend_color) - { GL_BLEND_COLOR_EXT, "GL_BLEND_COLOR_EXT", FLOAT, 4 }, -#endif -#if defined(GL_EXT_point_parameters) - { GL_DISTANCE_ATTENUATION_EXT, "GL_DISTANCE_ATTENUATION_EXT", FLOAT, 1 }, -#endif -#if defined(GL_INGR_blend_func_separate) - { GL_BLEND_SRC_RGB_INGR, "GL_BLEND_SRC_RGB_INGR", ENUM, 1 }, - { GL_BLEND_DST_RGB_INGR, "GL_BLEND_DST_RGB_INGR", ENUM, 1 }, - { GL_BLEND_SRC_ALPHA_INGR, "GL_BLEND_SRC_ALPHA_INGR", ENUM, 1 }, - { GL_BLEND_DST_ALPHA_INGR, "GL_BLEND_DST_ALPHA_INGR", ENUM, 1 }, -#endif - - - { LAST_TOKEN, "", 0, 0 } -}; - - -static const struct EnumRecord *FindRecord( GLenum var ) -{ - int i; - for (i = 0; EnumTable[i].enumerator != LAST_TOKEN; i++) { - if (EnumTable[i].enumerator == var) { - return &EnumTable[i]; - } - } - return NULL; -} - - - -/* - * Return the string label for the given enum. - */ -const char *GetEnumString( GLenum var ) -{ - const struct EnumRecord *rec = FindRecord(var); - if (rec) - return rec->string; - else - return NULL; -} - - - -/* - * Print current value of the given state variable. - */ -void PrintState( int indent, GLenum var ) -{ - const struct EnumRecord *rec = FindRecord(var); - - while (indent-- > 0) - putchar(' '); - - if (rec) { - if (rec->getCount <= 0) { - assert(rec->getType == ENUM); - printf("%s is not a state variable\n", rec->string); - } - else { - switch (rec->getType) { - case INT: - { - GLint values[100]; - int i; - glGetIntegerv(rec->enumerator, values); - printf("%s = ", rec->string); - for (i = 0; i < rec->getCount; i++) - printf("%d ", values[i]); - printf("\n"); - } - break; - case FLOAT: - { - GLfloat values[100]; - int i; - glGetFloatv(rec->enumerator, values); - printf("%s = ", rec->string); - for (i = 0; i < rec->getCount; i++) - printf("%f ", values[i]); - printf("\n"); - } - break; - case DOUBLE: - { - GLdouble values[100]; - int i; - glGetDoublev(rec->enumerator, values); - printf("%s = ", rec->string); - for (i = 0; i < rec->getCount; i++) - printf("%f ", (float) values[i]); - printf("\n"); - } - break; - case BOOLEAN: - { - GLboolean values[100]; - int i; - glGetBooleanv(rec->enumerator, values); - printf("%s = ", rec->string); - for (i = 0; i < rec->getCount; i++) - printf("%s ", values[i] ? "GL_TRUE" : "GL_FALSE"); - printf("\n"); - } - break; - case ENUM: - { - GLint values[100]; - int i; - glGetIntegerv(rec->enumerator, values); - printf("%s = ", rec->string); - for (i = 0; i < rec->getCount; i++) { - const char *str = GetEnumString((GLenum) values[i]); - if (str) - printf("%s ", str); - else - printf("??? "); - } - printf("\n"); - } - break; - case VOID: - { - GLvoid *values[100]; - int i; - glGetPointerv(rec->enumerator, values); - printf("%s = ", rec->string); - for (i = 0; i < rec->getCount; i++) { - printf("%p ", values[i]); - } - printf("\n"); - } - break; - default: - printf("fatal error in PrintState()\n"); - abort(); - } - } - } - else { - printf("Unknown GLenum passed to PrintState()\n"); - } -} - - - -/* - * Print all glPixelStore-related state. - * NOTE: Should write similar functions for lighting, texturing, etc. - */ -void PrintPixelStoreState( void ) -{ - const GLenum enums[] = { - GL_PACK_SWAP_BYTES, - GL_PACK_LSB_FIRST, - GL_PACK_ROW_LENGTH, - GL_PACK_SKIP_PIXELS, - GL_PACK_SKIP_ROWS, - GL_PACK_ALIGNMENT, - GL_UNPACK_SWAP_BYTES, - GL_UNPACK_LSB_FIRST, - GL_UNPACK_ROW_LENGTH, - GL_UNPACK_SKIP_PIXELS, - GL_UNPACK_SKIP_ROWS, - GL_UNPACK_ALIGNMENT, - 0 - }; - int i; - printf("Pixel pack/unpack state:\n"); - for (i = 0; enums[i]; i++) { - PrintState(3, enums[i]); - } -} - - - - -/* - * Print all state for the given attribute group. - */ -void PrintAttribState( GLbitfield attrib ) -{ - static const GLenum depth_buffer_enums[] = { - GL_DEPTH_FUNC, - GL_DEPTH_CLEAR_VALUE, - GL_DEPTH_TEST, - GL_DEPTH_WRITEMASK, - 0 - }; - static const GLenum fog_enums[] = { - GL_FOG, - GL_FOG_COLOR, - GL_FOG_DENSITY, - GL_FOG_START, - GL_FOG_END, - GL_FOG_INDEX, - GL_FOG_MODE, - 0 - }; - static const GLenum line_enums[] = { - GL_LINE_SMOOTH, - GL_LINE_STIPPLE, - GL_LINE_STIPPLE_PATTERN, - GL_LINE_STIPPLE_REPEAT, - GL_LINE_WIDTH, - 0 - }; - - const GLenum *enumList = NULL; - - switch (attrib) { - case GL_DEPTH_BUFFER_BIT: - enumList = depth_buffer_enums; - printf("GL_DEPTH_BUFFER_BIT state:\n"); - break; - case GL_FOG_BIT: - enumList = fog_enums; - printf("GL_FOG_BIT state:\n"); - break; - case GL_LINE_BIT: - enumList = line_enums; - printf("GL_LINE_BIT state:\n"); - break; - default: - printf("Bad value in PrintAttribState()\n"); - } - - if (enumList) { - int i; - for (i = 0; enumList[i]; i++) - PrintState(3, enumList[i]); - } -} - - -/*#define TEST*/ -#ifdef TEST - -#include "glut_wrap.h" - -int main( int argc, char *argv[] ) -{ - glutInit( &argc, argv ); - glutInitWindowPosition(0, 0); - glutInitWindowSize(400, 300); - glutInitDisplayMode(GLUT_RGB); - glutCreateWindow(argv[0]); - PrintAttribState(GL_DEPTH_BUFFER_BIT); - PrintAttribState(GL_FOG_BIT); - PrintAttribState(GL_LINE_BIT); - PrintState(0, GL_ALPHA_BITS); - PrintState(0, GL_VIEWPORT); - PrintState(0, GL_ALPHA_TEST_FUNC); - PrintState(0, GL_MODELVIEW_MATRIX); - PrintState(0, GL_ALWAYS); - PrintPixelStoreState(); - return 0; -} - -#endif diff --git a/src/util/glstate.h b/src/util/glstate.h deleted file mode 100644 index c5c9632..0000000 --- a/src/util/glstate.h +++ /dev/null @@ -1,51 +0,0 @@ - -/* - * Print GL state information (for debugging) - * Copyright (C) 1998 Brian Paul - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Library General Public - * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Library General Public License for more details. - * - * You should have received a copy of the GNU Library General Public - * License along with this library; if not, write to the Free - * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - */ - - -/* - * Revision 1.1 1999/08/19 00:55:42 jtg - * Initial revision - * - * Revision 1.2 1999/06/19 01:36:43 brianp - * more features added - * - * Revision 1.1 1998/11/24 03:41:16 brianp - * Initial revision - * - */ - - -#ifndef GLSTATE_H -#define GLSTATE_H - - -#include "gl_wrap.h" - - -extern const char *GetNameString( GLenum var ); - -extern void PrintState( int indent, GLenum var ); - -extern void PrintAttribState( GLbitfield attrib ); - -extern void PrintPixelStoreState( void ); - - -#endif commit 26f35a64d64d13263e740eea5418017f20552702 Author: Andreas Boll <[email protected]> Date: Sun Dec 6 14:05:46 2015 +0100 demos: add missing binaries to .gitignore Signed-off-by: Andreas Boll <[email protected]> Reviewed-by: Brian Paul <[email protected]> diff --git a/src/tests/.gitignore b/src/tests/.gitignore index 8f9cb58..1e86e68 100644 --- a/src/tests/.gitignore +++ b/src/tests/.gitignore @@ -57,6 +57,7 @@ invert jkrahntest lineclip linehacks +line-sample manytex mapbufrange mapvbo diff --git a/src/trivial/.gitignore b/src/trivial/.gitignore index d2b58c0..bca5f5e 100644 --- a/src/trivial/.gitignore +++ b/src/trivial/.gitignore @@ -137,6 +137,7 @@ tristrip-flat tri-tex tri-tex-1d tri-tex-3d +tri-tex-stipple tri-tri tri-unfilled tri-unfilled-clip commit 406248811eb0dfabf75ae9495b54529ec59cce66 Author: Ross Burton <[email protected]> Date: Wed Nov 11 11:39:33 2015 +0000 configure.ac: fix AC_WITH(glut) so that --without-glut works Currently if --without-glut is used on a system that has the GLUT libraries installed, GLUT is used regardless. Change the logic so that GLUT is searched for if and only if GLUT is requested. Signed-off-by: Ross Burton <[email protected]> Reviewed-by: Andreas Boll <[email protected]> diff --git a/configure.ac b/configure.ac index c4ee12b..9445424 100644 --- a/configure.ac +++ b/configure.ac @@ -67,21 +67,25 @@ DEMO_CFLAGS="$DEMO_CFLAGS $GL_CFLAGS" DEMO_LIBS="$DEMO_LIBS $GL_LIBS" dnl Check for GLUT -GLUT_CFLAGS="" -GLUT_LIBS=-lglut -glut_enabled=yes +glut_enabled=no AC_ARG_WITH([glut], [AS_HELP_STRING([--with-glut=DIR], [glut install directory])], [GLUT_CFLAGS="-I$withval/include" - GLUT_LIBS="-L$withval/lib -lglut"]) -AC_CHECK_HEADER([GL/glut.h], - [], - [glut_enabled=no]) -AC_CHECK_LIB([glut], - [glutInit], - [], - [glut_enabled=no]) + GLUT_LIBS="-L$withval/lib -lglut"], + [GLUT_CFLAGS="" + GLUT_LIBS="-lglut"] + ) +AS_IF([test "x$with_glut" != xno], + [AC_CHECK_HEADER([GL/glut.h], + [], + [glut_enabled=no]) + AC_CHECK_LIB([glut], + [glutInit], + [], + [glut_enabled=no])
