Mesa (master): 130 new commits

Michał Król michal at kemper.freedesktop.org
Thu Dec 17 08:42:58 PST 2009


URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=e195eab9093d2a6cf55a42b2e7789c9a381b7782
Merge: 1c28073fdfb56a241424c739b57845f47fa05002 75f371e973d19650a5c157a0844e43ffdea5e43e
Author: Michal Krol <michal at vmware.com>
Date:   Thu Dec 17 17:00:46 2009 +0100

    Merge branch 'glsl-pp-rework-2'

URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=75f371e973d19650a5c157a0844e43ffdea5e43e
Author: Michal Krol <michal at vmware.com>
Date:   Sat Dec 12 16:58:43 2009 +0100

    Remove grammar module -- no dependencies left.

URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=a3b32934c83f721102b9dd004227a528a174d7bb
Author: Michal Krol <michal at vmware.com>
Date:   Sat Dec 12 16:49:26 2009 +0100

    slang: Delete a file that is now autogenerated.
    
    This file has been modified in master and removed in feature branch.
    This gave a merge conflict I couldn't resolve by removing and git adding
    it to index.

URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=a3eb0f718e19653a2ad8e49396c904183be456f3
Merge: 491f384c3958067e6c4c994041f5d8d413b806bc 784cca9fa527de771754d76545970f78094b9adf
Author: Michal Krol <michal at vmware.com>
Date:   Sat Dec 12 16:48:32 2009 +0100

    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

URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=491f384c3958067e6c4c994041f5d8d413b806bc
Author: José Fonseca <jfonseca at vmware.com>
Date:   Thu Dec 10 16:29:04 2009 +0000

    scons: Get GLSL code building correctly when cross compiling.
    
    This is quite messy. GLSL code has to be built twice: one for the
    host OS, another for the target OS.

URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=289eab5389c0f0f3f85f872b2ba440f5e8416a50
Author: Brian Paul <brianp at vmware.com>
Date:   Thu Dec 10 09:16:20 2009 -0700

    glsl/sl: fix _parse_boolconstant()
    
    Need to emit the radix before the digits.
    This fixes several glean/glgl1 regressions.

URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=cc020425e929110613ddb405d3e82313d27a35ed
Author: Brian Paul <brianp at vmware.com>
Date:   Thu Dec 10 08:33:01 2009 -0700

    mesa: added new libglslpp.a and libglslcl.a to libGL build

URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=05eccfe79ec74a04630bcebff4c76accf4f85e0d
Author: Brian Paul <brianp at vmware.com>
Date:   Thu Dec 10 08:25:47 2009 -0700

    glsl/apps: remove unused vars

URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=0d654a7f2cf173723eee930d2e5b9a1dd0140aaf
Author: Brian Paul <brianp at vmware.com>
Date:   Thu Dec 10 08:25:35 2009 -0700

    glsl/pp: make some functions static

URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=52271c5345fedcb5b30736d69e4944889dda234c
Author: Brian Paul <brianp at vmware.com>
Date:   Thu Dec 10 08:25:16 2009 -0700

    glsl/pp: declare sl_pp_purify_options to silence warning

URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=7502b6affa72915cadeb0837028e7655e459da69
Author: Brian Paul <brianp at vmware.com>
Date:   Thu Dec 10 08:24:45 2009 -0700

    glsl/cl: silence unused var warning

URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=f00805a11756fa9d2bdfce15f51ae4798d72b5fb
Author: Michal Krol <michal at vmware.com>
Date:   Thu Dec 10 12:59:23 2009 +0100

    slang: Predefine ES symbols for FEATURE_es2_glsl.

URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=417f36ccb062bee01aff92d6fcdf47af3ece3cb4
Author: Michal Krol <michal at vmware.com>
Date:   Thu Dec 10 12:58:44 2009 +0100

    glsl/apps: Predefine __GLSL_PP_PREDEFINED_MACRO_TEST for testing.

URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=22200bcafcc77ecdca0127ac72d68e75e2ad7aee
Author: Michal Krol <michal at vmware.com>
Date:   Thu Dec 10 12:58:21 2009 +0100

    glsl/pp: Add support for user-defined macros.

URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=d1a09a9ba4a56067cc41e87d00fd7c395f0e7345
Author: Michal Krol <michal at vmware.com>
Date:   Thu Dec 10 12:39:37 2009 +0100

    glsl/apps: Explicitly add ARB_draw_buffers and ARB_texture_rectangle.

URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=48c60b0ecbc7d2f2b153d218a46c61928daddb8e
Author: Michal Krol <michal at vmware.com>
Date:   Thu Dec 10 12:39:10 2009 +0100

    slang: Explicitly enable ARB_draw_buffers and ARB_texture_rectangle.
    
    They are no longer built into the glsl preprocessor.

URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=91e164b3d0b1d36bfdf369266ae7e1ab396f1ba2
Author: Michal Krol <michal at vmware.com>
Date:   Thu Dec 10 12:38:22 2009 +0100

    glsl/pp: Add sl_pp_context_add_extension().
    
    This way third parties are able to add supported extension strings.

URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=068596c9a7e8d330ffdff8ad8700bd6093b5bdea
Author: michal <michal at transistor.(none)>
Date:   Thu Dec 10 01:03:15 2009 +0100

    Build mesa glsl with make.
    
    Still don't know how to add glsl to mesa dependencies.

URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=77a0a3e5ca5dfa951056d9054b4147e3ea0965f3
Author: Michal Krol <michal at vmware.com>
Date:   Wed Nov 25 14:59:29 2009 +0100

    glsl/apps: Make compile more shell friendly.

URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=ee27b713dc6a2d32dc287dc9462359804e051a06
Author: Michal Krol <michal at vmware.com>
Date:   Wed Nov 25 14:53:37 2009 +0100

    slang/library: Don't need the *_gc.h files, they are autogenerated now.

URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=3371f7e5025e5288eaba78973a2c81ec5d5b1e4d
Author: Michal Krol <michal at vmware.com>
Date:   Wed Nov 25 14:52:21 2009 +0100

    scons: Autogenerate GLSL builtin library *_gc.h from *.gc files.

URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=03f0ebe3bd202b955a0e68bdad65a9a2d27bee2f
Author: Michal Krol <michal at vmware.com>
Date:   Mon Nov 23 20:12:17 2009 +0100

    slang: Fix order of parameters to sl_pp_tokenise().

URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=6199a0cf89034ab92ac61158a25902acc17604f4
Author: Michal Krol <michal at vmware.com>
Date:   Sat Nov 21 20:44:16 2009 +0100

    glsl/apps: No need to purify source text for tokeniser.

URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=1cf021475a6628cdf4c26457bc7ca0c603fe2c7c
Author: Michal Krol <michal at vmware.com>
Date:   Sat Nov 21 20:43:02 2009 +0100

    slang: No need to purify source text for tokeniser.

URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=abe1f332983e5c70d75b5ae83f06c0dfdd081a26
Author: Michal Krol <michal at vmware.com>
Date:   Sat Nov 21 20:41:48 2009 +0100

    glsl/pp: Do purification and tokenisation in a single step.

URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=b89cd8afc510541a18f2f5c04884637626e104e1
Author: Michal Krol <michal at vmware.com>
Date:   Fri Nov 20 08:59:50 2009 +0100

    glsl/pp: Expand unknown identifiers to 0 in if/elif expressions.

URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=547ac2869b1e1bbdbf8e51cd40d50e6ab0f4f9f1
Author: Michal Krol <michal at vmware.com>
Date:   Tue Nov 17 09:06:53 2009 +0100

    glsl/pp: Fix macro formal argument parsing, more descriptive error msgs.

URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=eaa34c2deac093fc23e2beed9c5580e57289b1e2
Author: Michal Krol <michal at vmware.com>
Date:   Fri Nov 13 19:51:49 2009 +0100

    glsl/apps: Report syntax parser errors.

URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=3f147c71eda9e8b8f55562f30193584b6fb74704
Author: Michal Krol <michal at vmware.com>
Date:   Fri Nov 13 19:51:24 2009 +0100

    slang: Report syntax parser errors.

URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=99c89ebdb00ff0452f4b106cd53ec4a2e5162137
Author: Michal Krol <michal at vmware.com>
Date:   Fri Nov 13 19:51:02 2009 +0100

    glsl/cl: Add simple error reporting.

URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=b385312bc7f0b0b0d7410ef88eaa712831929abc
Author: Michal Krol <michal at vmware.com>
Date:   Fri Nov 13 06:03:56 2009 +0100

    slang: Regenerate .gc files.

URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=7593562a61ed59e5b645d9285a957a57704bfd6d
Author: Michal Krol <michal at vmware.com>
Date:   Fri Nov 13 05:58:46 2009 +0100

    slang: Get rid of the old syntax file and utilities.

URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=cd5553b457e2111f7057201aed4ad537e2f31ff9
Author: Michal Krol <michal at vmware.com>
Date:   Fri Nov 13 05:52:39 2009 +0100

    slang: Plug in the new syntax parser.

URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=f5b6e0639065eed99c491a1eb5413b96957b3b6a
Author: Michal Krol <michal at vmware.com>
Date:   Fri Nov 13 05:49:25 2009 +0100

    gdi: Link to glslcl.

URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=38a1f0b5d1062f8051ac6bb4e3c35fbbf4615163
Author: Michal Krol <michal at vmware.com>
Date:   Fri Nov 13 03:02:14 2009 +0100

    glsl/apps: Add GLSL compiler that translates source text into binary stream.
    
    Should be used in place of gc_to_bin utility to precompile builtin library.

URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=08e90bdea1e4828abfdff6fedfe9e669bfee9ff1
Author: Michal Krol <michal at vmware.com>
Date:   Fri Nov 13 03:00:45 2009 +0100

    glsl/cl: Add a hard-coded syntax parser.

URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=d44cebd1ee7b3e461e264150a28c9d49a0f69f8f
Author: Michal Krol <michal at vmware.com>
Date:   Tue Nov 10 20:49:45 2009 +0100

    glsl/pp: Add sl_pp_purify_getc().

URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=4703d7d3f8d50a0ff00dd043e999b0b8b11d45e6
Author: Michal Krol <michal at vmware.com>
Date:   Tue Nov 10 00:16:09 2009 +0100

    slang: Update for glsl/pp interface changes.

URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=b5c8c87eab4cbc4f05cbd98d7647b9b83607f976
Author: Michal Krol <michal at vmware.com>
Date:   Tue Nov 10 00:15:54 2009 +0100

    glsl/apps: Update for glsl/pp interface changes.

URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=d37f7694b60d3dad8daf9e2af4e509c15b996553
Author: Michal Krol <michal at vmware.com>
Date:   Tue Nov 10 00:15:33 2009 +0100

    glsl/pp: Have sl_pp_purify() return error msg/line no.

URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=c4bd6ccde8241d6a5eb631c713ba79db51163701
Author: Michal Krol <michal at vmware.com>
Date:   Mon Sep 28 11:30:15 2009 +0200

    glsl/pp: Expand macro actual arguments before pasting into its body.

URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=92e33569f39a2fa9061a0c35c233c1db33820033
Author: Michal Krol <michal at vmware.com>
Date:   Thu Sep 24 10:57:55 2009 +0200

    glsl/pp: Add forward decls to silence gcc warnings.

URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=69fec23251740c3071ffc3fefc8981599bdb22ef
Author: Michal Krol <michal at vmware.com>
Date:   Thu Sep 24 10:57:32 2009 +0200

    glsl/pp: Avoid using `__VERSION__' as an identifier.

URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=7a95a3c7c4ba49ec174681c36951e3c0672df06c
Author: Michal Krol <michal at vmware.com>
Date:   Thu Sep 24 10:56:46 2009 +0200

    glsl/pp: Include missing headers.

URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=e1eed5670246e08119ed7e4afa5313e7717b8128
Author: Michal Krol <michal at vmware.com>
Date:   Thu Sep 24 10:56:01 2009 +0200

    glsl/pp: Allow builds on all platforms.

URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=e8e3fe15e1b0f75c43e197f8875a7fae1468f584
Author: Michal Krol <michal at vmware.com>
Date:   Thu Sep 24 10:55:37 2009 +0200

    glsl/apps: Include missing header, properly escape format strings.

URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=db097a9a3ff532d37875b8cd911dda0515a60dcd
Author: Michal Krol <michal at vmware.com>
Date:   Thu Sep 24 10:54:56 2009 +0200

    glsl/apps: Allow builds on all platforms.

URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=a58360dbc2ee1ef919ecd50bd46cb57a151b8550
Author: Michal Krol <michal at vmware.com>
Date:   Thu Sep 24 09:04:15 2009 +0200

    glsl/pp: Use struct instead of union.

URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=13f9a39cea81bf8f1efd4aca1467c63a49a42dab
Author: Michal Krol <michal at vmware.com>
Date:   Thu Sep 24 08:43:54 2009 +0200

    glsl/apps: Fix apps after pp interface changes.

URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=9a1447d449209635e481c7f9bd02084864e17419
Author: Michal Krol <michal at vmware.com>
Date:   Thu Sep 24 08:43:05 2009 +0200

    glsl/pp: Store both line number and file index in a single token.

URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=8212e4d9fabb0c441575975c12d656364baba6fe
Author: Michal Krol <michal at vmware.com>
Date:   Wed Sep 23 09:40:40 2009 +0200

    grammar: Include the correct glsl pp header.

URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=1ed1dc8b4197ef5a6b0b1fab6ef0694f379642d8
Author: Michal Krol <michal at vmware.com>
Date:   Wed Sep 23 09:40:24 2009 +0200

    glsl/pp: Include missing headers.

URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=2f89e1a5a18c4c3c88d4e7613cbfc0f85a5fcfc9
Author: Michal Krol <michal at vmware.com>
Date:   Wed Sep 23 09:37:37 2009 +0200

    glsl/pp: Add `0' and `1' to dictionary.

URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=32966991c629fa43818f42912deb9deca913ef60
Author: Michal Krol <michal at vmware.com>
Date:   Wed Sep 23 09:33:12 2009 +0200

    glsl/pp: Check for reserved macro names.

URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=b1e6514a94effb1a5ea03c31f5a50e9e60638e51
Author: Michal Krol <michal at vmware.com>
Date:   Tue Sep 22 12:54:45 2009 +0200

    slang: Differentiate between uints and floats.

URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=cd41395073839365b79e6b1cca2e35e08a57bf7b
Author: Michal Krol <michal at vmware.com>
Date:   Tue Sep 22 12:52:53 2009 +0200

    grammar: Differentiate between uints and floats.

URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=125691dda3d261d3115bf85265428e28d2bbf6c8
Author: Michal Krol <michal at vmware.com>
Date:   Tue Sep 22 12:52:21 2009 +0200

    glsl/apps: Update after recent pp interface changes.

URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=0481e85af7195e13c30580afba233a80feeee740
Author: Michal Krol <michal at vmware.com>
Date:   Tue Sep 22 12:51:08 2009 +0200

    glsl/pp: Differentiate between integer and floating-point number tokens.

URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=bb32b0908ff0d3a99758abd46356676fc1ec2369
Author: Michal Krol <michal at vmware.com>
Date:   Fri Sep 18 11:42:30 2009 +0200

    progs/perf: Fix newlines.

URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=5f9f30a75268bf6803627930ce982aede2c870f5
Author: Michal Krol <michal at vmware.com>
Date:   Fri Sep 18 11:20:42 2009 +0200

    glsl/apps: Use glsl pp public interface.

URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=8302208b02739904cfeb5bcc22e63b15c8ec26e9
Author: Michal Krol <michal at vmware.com>
Date:   Fri Sep 18 11:19:54 2009 +0200

    slang: Use glsl pp public interface.

URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=95956bb8cb9513c429b9749426720be94f4cf5a8
Author: Michal Krol <michal at vmware.com>
Date:   Fri Sep 18 11:19:25 2009 +0200

    glsl/pp: Define a public interface for external modules.
    
    Make sl_pp_context struct opaque.
    Move all public declarations to sl_pp_public.h.

URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=2a661c383fee65bc4413541e706925fa3e9b9cf5
Merge: 90daefd1c474a6e0502df5053b581987c12b8673 21caa29fbd332a2ee05a58df91e1664fbbc4e61f
Author: Michal Krol <michal at vmware.com>
Date:   Thu Sep 17 12:44:24 2009 +0200

    Merge commit 'origin/master' into glsl-pp-rework-2
    
    Conflicts:
    	src/gallium/winsys/gdi/SConscript

URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=90daefd1c474a6e0502df5053b581987c12b8673
Author: Michal Krol <michal at vmware.com>
Date:   Thu Sep 17 12:33:26 2009 +0200

    glsl/pp: Add a TODO for FEATURE_es2_glsl.

URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=4fcda5000eed29b7c2ba70506ae34b209239eec6
Author: Michal Krol <michal at vmware.com>
Date:   Thu Sep 17 12:14:12 2009 +0200

    slang/pp: Fix file number parsing.

URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=ce8f486156f5c4b28b51954ea862675275c38f6d
Author: Michal Krol <michal at vmware.com>
Date:   Thu Sep 17 12:12:34 2009 +0200

    slang/pp: Use a dictionary for the remaining string literals.

URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=0ddf41d34d511b339e0bb5a59673765f1bf0b3a5
Author: Michal Krol <michal at vmware.com>
Date:   Thu Sep 17 11:51:35 2009 +0200

    glsl/pp: Add remaining error messages.

URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=69bdd47dba1f7331a632316e4f9cc9942fb93ca4
Author: Michal Krol <michal at vmware.com>
Date:   Thu Sep 17 10:45:16 2009 +0200

    glsl/apps: Always write out error condition.

URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=cc629940d4a47c998d0ed5dbcc0f396025932e0e
Author: Michal Krol <michal at vmware.com>
Date:   Wed Sep 16 22:04:22 2009 +0200

    glsl/apps: Always write out error condition.

URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=a7382628f2ed5a2886a1828dd847d75bf8e9b38e
Author: Michal Krol <michal at vmware.com>
Date:   Wed Sep 16 21:51:12 2009 +0200

    glsl/pp: Validate numbers.

URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=de0753e4cb64792d257ad3799932a77321fc3c49
Author: Michal Krol <michal at vmware.com>
Date:   Wed Sep 16 20:40:02 2009 +0200

    glsl/pp: Add more error messages.

URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=c9de313f1b6d0ee8d9304fc3fe11fb84ff494f12
Author: Michal Krol <michal at vmware.com>
Date:   Wed Sep 16 20:28:20 2009 +0200

    slang: Propagate error messages from preprocessor.

URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=d4638f5dce4cb2c873acafb289036fd59c7a3c78
Author: Michal Krol <michal at vmware.com>
Date:   Wed Sep 16 20:27:59 2009 +0200

    glsl/pp: Add more error messages.

URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=eeb5202e5ddf1cc95c35d46fd425afd0695b85bb
Author: Michal Krol <michal at vmware.com>
Date:   Wed Sep 16 19:24:50 2009 +0200

    slang: Invoke the preprocessor from withing the slang compiler.
    
    This allows us to validate the shader version number.

URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=0f302b60fd6d43a47e208979d0677e09f4a802fc
Author: Michal Krol <michal at vmware.com>
Date:   Mon Sep 14 13:09:36 2009 +0200

    glsl/pp: Support GL_ARB_draw_buffers and GL_ARB_texture_rectangle.

URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=cd26ccf6fecd03ca66731340c7bb7341eaa093a1
Author: Michal Krol <michal at vmware.com>
Date:   Mon Sep 14 13:08:16 2009 +0200

    grammar: Adapt to pp interface change.

URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=169aead1b55446c7bfe669b6a822d56e8af15f7f
Author: Michal Krol <michal at vmware.com>
Date:   Mon Sep 14 13:08:07 2009 +0200

    glsl/apps: Adapt to pp interface change.

URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=a67f32289a6e22daa2665310f4a8f26979f7ed60
Author: Michal Krol <michal at vmware.com>
Date:   Mon Sep 14 13:07:25 2009 +0200

    glsl/pp: Add a dictionary to a context.

URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=9f273f109875cd9208d4c1c8f5939fb5e507c230
Merge: fab99092a0879531442d1dd20f971ae7eda824eb aad0deee4b2d347bdfc536fe98938ed825bf0f6b
Author: Michal Krol <michal at vmware.com>
Date:   Mon Sep 14 11:22:05 2009 +0200

    Merge commit 'origin/master' into glsl-pp-rework-2

URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=fab99092a0879531442d1dd20f971ae7eda824eb
Author: Michal Krol <michal at vmware.com>
Date:   Tue Sep 8 13:32:20 2009 +0200

    slang: Correctly handle end of tokens marker.

URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=2ec2936454a4a69b5b3b438ab66f00a5b7d2a5e5
Author: Michal Krol <michal at vmware.com>
Date:   Tue Sep 8 13:29:17 2009 +0200

    slang: Do not parse whitespace.
    
    The preprocessor tokeniser deals with those.

URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=58fa89c90279e2bdfc7331d7b632a748e2126ca1
Author: Michal Krol <michal at vmware.com>
Date:   Tue Sep 8 12:46:34 2009 +0200

    slang: Correctly parse numbers from the new preprocessor.

URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=b837f6c372f0059170d93ac564f58aeebca3c70a
Author: Michal Krol <michal at vmware.com>
Date:   Tue Sep 8 10:57:39 2009 +0200

    grammar: Fix token stripping.

URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=d06069f30513163108489dd189dc8027cb4ad643
Author: Michal Krol <michal at vmware.com>
Date:   Tue Sep 8 10:46:29 2009 +0200

    slang: Remove the old preprocessor.

URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=7e6e5cd60a4ce2f63cd2563307d79fc0ed7218cd
Author: Michal Krol <michal at vmware.com>
Date:   Tue Sep 8 10:33:49 2009 +0200

    slang: Remove dependencies on error tokens.

URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=0aeff7638b4ae14a9142ff05390cbc89a058d57e
Author: Michal Krol <michal at vmware.com>
Date:   Tue Sep 8 10:22:07 2009 +0200

    gdi: Fix prototype of gdi_softpipe_surface_buffer_create().

URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=5ddcdc42277ee2ba011980aebac7f3a12bd80c9d
Author: Michal Krol <michal at vmware.com>
Date:   Mon Sep 7 21:30:34 2009 +0200

    slang: Adapt shader syntax description to grammar parser changes.

URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=ce9309d24595af324a2c7222a96100cddf5f2c9b
Author: Michal Krol <michal at vmware.com>
Date:   Mon Sep 7 21:27:42 2009 +0200

    grammar: Adapt grammar to the glsl preprocessor.

URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=d26d77295b87cbd61ccafcf03d30b0c900d22a5f
Author: Michal Krol <michal at vmware.com>
Date:   Mon Sep 7 21:23:43 2009 +0200

    gdi: Add glsl to LIBS.

URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=b97a73465816652dda36b08c19038f06964ff130
Author: Michal Krol <michal at vmware.com>
Date:   Mon Sep 7 17:45:26 2009 +0200

    grammar: Remove dead code.

URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=8bed21ecf9ff3f0244de2011f5177f16136e255f
Author: Michal Krol <michal at vmware.com>
Date:   Mon Sep 7 10:55:45 2009 +0200

    grammar: Remove grammar_check().

URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=5ad89377522061775b467d84bf6dc14305cccfbf
Author: Michal Krol <michal at vmware.com>
Date:   Mon Sep 7 10:01:11 2009 +0200

    glsl: Add error messages for version parser.

URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=b7960b3d3ac347604bfec705a50d6c2eda439eef
Author: Michal Krol <michal at vmware.com>
Date:   Fri Sep 4 15:29:35 2009 +0200

    glsl: Handle file tokens in apps/process.

URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=a64ba93aab6de7ee2ceb70f39cf2dbe794940c97
Author: Michal Krol <michal at vmware.com>
Date:   Fri Sep 4 15:27:08 2009 +0200

    glsl: Handle file numbering.

URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=2d2d6384448baae3c04eced3373d96907def4e13
Author: Michal Krol <michal at vmware.com>
Date:   Fri Sep 4 15:20:31 2009 +0200

    glsl: Actually respect the hash-line directive.

URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=b6df77fb9a6093eb8ed13b5c7c1327c162c41584
Author: Michal Krol <michal at vmware.com>
Date:   Fri Sep 4 15:16:42 2009 +0200

    glsl: Handle line tokens in apps/process.

URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=4aa3222df315e3b36c73374e9000a6607c3b995c
Author: Michal Krol <michal at vmware.com>
Date:   Fri Sep 4 15:16:21 2009 +0200

    glsl: Correctly handle line numbering.

URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=0d9c5eafeb35fdd2e5009ba0b397d1acdfbd3205
Author: Michal Krol <michal at vmware.com>
Date:   Fri Sep 4 15:11:58 2009 +0200

    glsl: Preserve newline inside comment blocks.

URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=e8afc6558909d9503a83c8cc184a2e2bb008746b
Author: Michal Krol <michal at vmware.com>
Date:   Fri Sep 4 13:30:40 2009 +0200

    glsl: Implement predefinded macros.
    
    The values are hardcoded: __LINE__ = 1, __FILE__ = 0 and __VERSION__ = 110.

URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=bb8f38ea6f71179cd4adb0ca33c464716be17dcb
Author: Michal Krol <michal at vmware.com>
Date:   Fri Sep 4 11:58:19 2009 +0200

    glsl: Implement `line' preprocessor directive.

URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=ddd8ae7fbc643892b08ddf66c67bca36d42b53a6
Author: Michal Krol <michal at vmware.com>
Date:   Fri Sep 4 11:39:30 2009 +0200

    glsl: Output endof token after processing a directive.
    
    Some directives may output tokens as a result of their operation.

URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=7f187583c14448047c95d933a96b190273a881e5
Author: Michal Krol <michal at vmware.com>
Date:   Fri Sep 4 11:33:15 2009 +0200

    glsl: Handle extension tokens in apps/proces.

URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=87d2de04fbb7d9ea8eae9c58f7c7fb842ffe06f6
Author: Michal Krol <michal at vmware.com>
Date:   Fri Sep 4 11:32:46 2009 +0200

    glsl: Implement `extension' preprocessor directive.
    
    No extensions supported.

URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=94321b44416f47eb08bf72c93f4299ff7dc47017
Author: Michal Krol <michal at vmware.com>
Date:   Fri Sep 4 10:49:12 2009 +0200

    glsl: Handle pragma tokens in apps/process.

URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=0e046420e468bcb81301aa5a5e4de736a8b4844a
Author: Michal Krol <michal at vmware.com>
Date:   Fri Sep 4 10:48:51 2009 +0200

    glsl: Implement `pragma' preprocessor directive.
    
    Handle `optimize(on|off)' and `debug(on|off)' pragmas.

URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=c42428c787aae4bc560adf507991f1e274407135
Author: Michal Krol <michal at vmware.com>
Date:   Fri Sep 4 08:16:14 2009 +0200

    glsl: Print out error message in apps/process.

URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=f9bd6f7152047e6230c85d76e412a5bb524e0413
Author: Michal Krol <michal at vmware.com>
Date:   Fri Sep 4 08:14:48 2009 +0200

    glsl: Implement `error' preprocessor directive.

URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=3dc2b5f71c2a519409becb6c1f177b5981fbacf7
Author: Michal Krol <michal at vmware.com>
Date:   Fri Jun 26 12:48:14 2009 +0200

    glsl: Implement `undef' preprocessor directive.

URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=a294715612d14d64e12026361ff7cc29321607d6
Author: Michal Krol <michal at vmware.com>
Date:   Fri Jun 26 12:26:05 2009 +0200

    glsl: Allow for preprocessor macro redefinition.

URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=153b179862411e9de14d26bbcff16bc81f1edc91
Author: Michal Krol <michal at vmware.com>
Date:   Fri Jun 26 11:53:13 2009 +0200

    glsl: Handle `defined' preprocessor operator.

URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=3b027bca9d54383b2fc8b2ad5a9cb6d2166c7acc
Author: Michal Krol <michal at vmware.com>
Date:   Fri Jun 26 11:44:43 2009 +0200

    glsl: Support if preprocessor directive and friends.

URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=3bb446ba6e890bc3f60a34318a5a0fe860e53cbb
Author: Michal Krol <michal at vmware.com>
Date:   Fri Jun 26 10:59:25 2009 +0200

    glsl: Add expression interpreter.

URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=2dad8ed9d68289ba25a4023da12fc5ddf6a621dd
Author: Michal Krol <michal at vmware.com>
Date:   Mon Jun 22 09:14:14 2009 +0200

    glsl: Centralise sl_pp_macro constructor.

URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=6a11d4150cfcdd646c17f8b365b5481c2c583208
Author: Michal Krol <michal at vmware.com>
Date:   Mon Jun 22 09:05:29 2009 +0200

    glsl: Implement macro expansion.

URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=5e8e3cddae9b2797cfa525c643c701debe2f4c04
Author: Michal Krol <michal at vmware.com>
Date:   Sun Jun 21 17:03:15 2009 +0200

    glsl: Rename sl_pp_context_add_str to sl_pp_context_add_unique_str.
    
    Return the same offset for same strings. Allows to compare strings
    by comparing their's offsets.

URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=fd991d845a5f639b9b675a4840ad234c151d56b4
Author: Michal Krol <michal at vmware.com>
Date:   Fri Jun 19 12:02:28 2009 +0200

    glsl: Parse define directive in preprocessor.

URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=3ce5e668180748e2eccd1a8d3931ab98c2919df3
Author: Michal Krol <michal at vmware.com>
Date:   Wed Jun 17 20:29:46 2009 +0200

    glsl: Simplify directive parser skeleton.

URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=f24322fbf6599b31f07ebc548e390c77b803d67c
Author: Michal Krol <michal at vmware.com>
Date:   Wed Jun 17 13:49:06 2009 +0200

    glsl: Introduce sl_pp_context and maintain a reuseable pool of strings.

URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=f24ec185c531d2b2209df01901c90eca57ca711f
Author: Michal Krol <michal at vmware.com>
Date:   Mon Jun 15 11:02:04 2009 +0200

    glsl: Add `process' test app that returns tokenised and preprocessed text.

URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=9d336c5264d59e455380a305ee99675e2219ae06
Author: Michal Krol <michal at vmware.com>
Date:   Mon Jun 15 11:01:20 2009 +0200

    glsl: Add preprocessor skeleton for directive parsing.

URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=5d26deef981d201573252125a8a106b87f66a73c
Author: Michal Krol <michal at vmware.com>
Date:   Mon Jun 15 10:44:57 2009 +0200

    glsl: Remove bogus sl_pp_directive.h include.

URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=b4e92367f33c8bdd14337ced63abe82685f08cb3
Author: Michal Krol <michal at vmware.com>
Date:   Mon Jun 15 09:50:48 2009 +0200

    glsl: Allow for multiple version statements.

URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=55f75c13f05ea6373b95f0777078fcdec226672a
Author: Michal Krol <michal at vmware.com>
Date:   Sat Jun 13 19:42:11 2009 +0200

    glsl/apps: Print out the number of tokens eaten in version test.

URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=474f754282c06014fa0f687c08f4e97323166f83
Author: Michal Krol <michal at vmware.com>
Date:   Sat Jun 13 13:50:45 2009 +0200

    glsl: Raise an error on an unfinished comment block.

URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=af617c603720cf41ec433f1653cc6dbdcffd8e31
Author: Michal Krol <michal at vmware.com>
Date:   Sat Jun 13 13:44:56 2009 +0200

    glsl/apps: Add version test app.

URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=229e72956ca6844647bd64d864716b8e21aff89b
Author: Michal Krol <michal at vmware.com>
Date:   Sat Jun 13 13:43:22 2009 +0200

    glsl: Parse optional version directive.

URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=0d5ef796f847bc51888a8883110cc607494a61f0
Author: Michal Krol <michal at vmware.com>
Date:   Fri Jun 12 12:57:59 2009 +0200

    glsl: Add a tokenise app.

URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=2c9a627b48119b3cafc9fb25239fe929bc4cf8d8
Author: Michal Krol <michal at vmware.com>
Date:   Fri Jun 12 12:57:29 2009 +0200

    glsl: Add a preprocessor tokeniser.

URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=121769eeb314ea580a3292309332ebbf0a409b3c
Author: Michal Krol <michal at vmware.com>
Date:   Thu Jun 11 18:56:10 2009 +0200

    glsl: Add a purify command-line tool.

URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=0bbf59c3052a7b4f6f8330985317adce2bfd0fef
Author: Michal Krol <michal at vmware.com>
Date:   Thu Jun 11 14:04:39 2009 +0200

    glsl: Add preprocessor purifier.



More information about the mesa-commit mailing list