Brian Paul [Thu, 10 Dec 2009 15:25:16 +0000 (08:25 -0700)]
glsl/pp: declare sl_pp_purify_options to silence warning
Brian Paul [Thu, 10 Dec 2009 15:24:45 +0000 (08:24 -0700)]
glsl/cl: silence unused var warning
Michal Krol [Thu, 10 Dec 2009 11:59:23 +0000 (12:59 +0100)]
slang: Predefine ES symbols for FEATURE_es2_glsl.
Michal Krol [Thu, 10 Dec 2009 11:58:44 +0000 (12:58 +0100)]
glsl/apps: Predefine __GLSL_PP_PREDEFINED_MACRO_TEST for testing.
Michal Krol [Thu, 10 Dec 2009 11:58:21 +0000 (12:58 +0100)]
glsl/pp: Add support for user-defined macros.
Michal Krol [Thu, 10 Dec 2009 11:39:37 +0000 (12:39 +0100)]
glsl/apps: Explicitly add ARB_draw_buffers and ARB_texture_rectangle.
Michal Krol [Thu, 10 Dec 2009 11:39:10 +0000 (12:39 +0100)]
slang: Explicitly enable ARB_draw_buffers and ARB_texture_rectangle.
They are no longer built into the glsl preprocessor.
Michal Krol [Thu, 10 Dec 2009 11:38:22 +0000 (12:38 +0100)]
glsl/pp: Add sl_pp_context_add_extension().
This way third parties are able to add supported extension strings.
michal [Thu, 10 Dec 2009 00:03:15 +0000 (01:03 +0100)]
Build mesa glsl with make.
Still don't know how to add glsl to mesa dependencies.
Michal Krol [Wed, 25 Nov 2009 13:59:29 +0000 (14:59 +0100)]
glsl/apps: Make compile more shell friendly.
Michal Krol [Wed, 25 Nov 2009 13:53:37 +0000 (14:53 +0100)]
slang/library: Don't need the *_gc.h files, they are autogenerated now.
Michal Krol [Wed, 25 Nov 2009 13:52:21 +0000 (14:52 +0100)]
scons: Autogenerate GLSL builtin library *_gc.h from *.gc files.
Michal Krol [Mon, 23 Nov 2009 19:12:17 +0000 (20:12 +0100)]
slang: Fix order of parameters to sl_pp_tokenise().
Michal Krol [Sat, 21 Nov 2009 19:44:16 +0000 (20:44 +0100)]
glsl/apps: No need to purify source text for tokeniser.
Michal Krol [Sat, 21 Nov 2009 19:43:02 +0000 (20:43 +0100)]
slang: No need to purify source text for tokeniser.
Michal Krol [Sat, 21 Nov 2009 19:41:48 +0000 (20:41 +0100)]
glsl/pp: Do purification and tokenisation in a single step.
Michal Krol [Fri, 20 Nov 2009 07:59:50 +0000 (08:59 +0100)]
glsl/pp: Expand unknown identifiers to 0 in if/elif expressions.
Michal Krol [Tue, 17 Nov 2009 08:06:53 +0000 (09:06 +0100)]
glsl/pp: Fix macro formal argument parsing, more descriptive error msgs.
Michal Krol [Fri, 13 Nov 2009 18:51:49 +0000 (19:51 +0100)]
glsl/apps: Report syntax parser errors.
Michal Krol [Fri, 13 Nov 2009 18:51:24 +0000 (19:51 +0100)]
slang: Report syntax parser errors.
Michal Krol [Fri, 13 Nov 2009 18:51:02 +0000 (19:51 +0100)]
glsl/cl: Add simple error reporting.
Michal Krol [Fri, 13 Nov 2009 05:03:56 +0000 (06:03 +0100)]
slang: Regenerate .gc files.
Michal Krol [Fri, 13 Nov 2009 04:58:46 +0000 (05:58 +0100)]
slang: Get rid of the old syntax file and utilities.
Michal Krol [Fri, 13 Nov 2009 04:52:39 +0000 (05:52 +0100)]
slang: Plug in the new syntax parser.
Michal Krol [Fri, 13 Nov 2009 04:49:25 +0000 (05:49 +0100)]
gdi: Link to glslcl.
Michal Krol [Fri, 13 Nov 2009 02:02:14 +0000 (03:02 +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.
Michal Krol [Fri, 13 Nov 2009 02:00:45 +0000 (03:00 +0100)]
glsl/cl: Add a hard-coded syntax parser.
Michal Krol [Tue, 10 Nov 2009 19:49:45 +0000 (20:49 +0100)]
glsl/pp: Add sl_pp_purify_getc().
Michal Krol [Mon, 9 Nov 2009 23:16:09 +0000 (00:16 +0100)]
slang: Update for glsl/pp interface changes.
Michal Krol [Mon, 9 Nov 2009 23:15:54 +0000 (00:15 +0100)]
glsl/apps: Update for glsl/pp interface changes.
Michal Krol [Mon, 9 Nov 2009 23:15:33 +0000 (00:15 +0100)]
glsl/pp: Have sl_pp_purify() return error msg/line no.
Michal Krol [Mon, 28 Sep 2009 09:30:15 +0000 (11:30 +0200)]
glsl/pp: Expand macro actual arguments before pasting into its body.
Michal Krol [Thu, 24 Sep 2009 08:57:55 +0000 (10:57 +0200)]
glsl/pp: Add forward decls to silence gcc warnings.
Michal Krol [Thu, 24 Sep 2009 08:57:32 +0000 (10:57 +0200)]
glsl/pp: Avoid using `__VERSION__' as an identifier.
Michal Krol [Thu, 24 Sep 2009 08:56:46 +0000 (10:56 +0200)]
glsl/pp: Include missing headers.
Michal Krol [Thu, 24 Sep 2009 08:56:01 +0000 (10:56 +0200)]
glsl/pp: Allow builds on all platforms.
Michal Krol [Thu, 24 Sep 2009 08:55:37 +0000 (10:55 +0200)]
glsl/apps: Include missing header, properly escape format strings.
Michal Krol [Thu, 24 Sep 2009 08:54:56 +0000 (10:54 +0200)]
glsl/apps: Allow builds on all platforms.
Michal Krol [Thu, 24 Sep 2009 07:04:15 +0000 (09:04 +0200)]
glsl/pp: Use struct instead of union.
Michal Krol [Thu, 24 Sep 2009 06:43:54 +0000 (08:43 +0200)]
glsl/apps: Fix apps after pp interface changes.
Michal Krol [Thu, 24 Sep 2009 06:43:05 +0000 (08:43 +0200)]
glsl/pp: Store both line number and file index in a single token.
Michal Krol [Wed, 23 Sep 2009 07:40:40 +0000 (09:40 +0200)]
grammar: Include the correct glsl pp header.
Michal Krol [Wed, 23 Sep 2009 07:40:24 +0000 (09:40 +0200)]
glsl/pp: Include missing headers.
Michal Krol [Wed, 23 Sep 2009 07:37:37 +0000 (09:37 +0200)]
glsl/pp: Add `0' and `1' to dictionary.
Michal Krol [Wed, 23 Sep 2009 07:33:12 +0000 (09:33 +0200)]
glsl/pp: Check for reserved macro names.
Michal Krol [Tue, 22 Sep 2009 10:54:45 +0000 (12:54 +0200)]
slang: Differentiate between uints and floats.
Michal Krol [Tue, 22 Sep 2009 10:52:53 +0000 (12:52 +0200)]
grammar: Differentiate between uints and floats.
Michal Krol [Tue, 22 Sep 2009 10:52:21 +0000 (12:52 +0200)]
glsl/apps: Update after recent pp interface changes.
Michal Krol [Tue, 22 Sep 2009 10:51:08 +0000 (12:51 +0200)]
glsl/pp: Differentiate between integer and floating-point number tokens.
Michal Krol [Fri, 18 Sep 2009 09:42:30 +0000 (11:42 +0200)]
progs/perf: Fix newlines.
Michal Krol [Fri, 18 Sep 2009 09:20:42 +0000 (11:20 +0200)]
glsl/apps: Use glsl pp public interface.
Michal Krol [Fri, 18 Sep 2009 09:19:54 +0000 (11:19 +0200)]
slang: Use glsl pp public interface.
Michal Krol [Fri, 18 Sep 2009 09:19:25 +0000 (11:19 +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.
Michal Krol [Thu, 17 Sep 2009 10:44:24 +0000 (12:44 +0200)]
Merge commit 'origin/master' into glsl-pp-rework-2
Conflicts:
src/gallium/winsys/gdi/SConscript
Michal Krol [Thu, 17 Sep 2009 10:33:26 +0000 (12:33 +0200)]
glsl/pp: Add a TODO for FEATURE_es2_glsl.
Michal Krol [Thu, 17 Sep 2009 10:14:12 +0000 (12:14 +0200)]
slang/pp: Fix file number parsing.
Michal Krol [Thu, 17 Sep 2009 10:12:34 +0000 (12:12 +0200)]
slang/pp: Use a dictionary for the remaining string literals.
Michal Krol [Thu, 17 Sep 2009 09:51:35 +0000 (11:51 +0200)]
glsl/pp: Add remaining error messages.
Michal Krol [Thu, 17 Sep 2009 08:45:16 +0000 (10:45 +0200)]
glsl/apps: Always write out error condition.
Brian Paul [Thu, 17 Sep 2009 03:49:55 +0000 (21:49 -0600)]
mesa: begin some texstore code refactoring
Next step will be to move the calls to ctx->Driver.ChooseTextureFormat()
into the teximage.c functions so drivers don't have to do it.
Brian Paul [Thu, 17 Sep 2009 02:09:05 +0000 (20:09 -0600)]
mesa: meta driver functions for glCopyTex[Sub]Image()
Implement in terms of glReadPixels + glTex[Sub]Image().
This will allow us to get rid of some swrast texture code.
Brian Paul [Thu, 17 Sep 2009 01:33:01 +0000 (19:33 -0600)]
progs/perf: initial set of simple performance test programs
Initial tests include:
drawoverhead - measure overhead of state changes w.r.t drawing commands
teximage - measure glTexImage2D() and glTexSubImage2D() speed
vbo - measure glBufferData() and glBufferSubData() speed
vertexrate - measure vertex rate for immediate mode, glDrawArrays, VBOs, etc.
Brian Paul [Wed, 16 Sep 2009 21:49:33 +0000 (15:49 -0600)]
progs/glsl: minor Makefile clean-ups
Brian Paul [Wed, 16 Sep 2009 21:48:52 +0000 (15:48 -0600)]
swrast: remove mipmap generation checks (done in core Mesa now)
Brian Paul [Wed, 16 Sep 2009 01:53:50 +0000 (19:53 -0600)]
s3v: remove unneeded initializations
Brian Paul [Wed, 16 Sep 2009 01:47:06 +0000 (19:47 -0600)]
ffb: remove disabled code
Michal Krol [Wed, 16 Sep 2009 20:04:22 +0000 (22:04 +0200)]
glsl/apps: Always write out error condition.
Michal Krol [Wed, 16 Sep 2009 19:51:12 +0000 (21:51 +0200)]
glsl/pp: Validate numbers.
José Fonseca [Wed, 16 Sep 2009 15:12:22 +0000 (16:12 +0100)]
llvmpipe: Don't assert due to unsupported texture wrap modes.
Issue a warning and fallback to clamping.
Michal Krol [Wed, 16 Sep 2009 18:40:02 +0000 (20:40 +0200)]
glsl/pp: Add more error messages.
Michal Krol [Wed, 16 Sep 2009 18:28:20 +0000 (20:28 +0200)]
slang: Propagate error messages from preprocessor.
Michal Krol [Wed, 16 Sep 2009 18:27:59 +0000 (20:27 +0200)]
glsl/pp: Add more error messages.
Michal Krol [Wed, 16 Sep 2009 17:24:50 +0000 (19:24 +0200)]
slang: Invoke the preprocessor from withing the slang compiler.
This allows us to validate the shader version number.
Ian Romanick [Wed, 16 Sep 2009 15:05:36 +0000 (08:05 -0700)]
Merge branch 'mesa_7_6_branch'
Brian Paul [Wed, 16 Sep 2009 14:59:32 +0000 (08:59 -0600)]
gallium: remove incorrect 'return' stmt
Ian Romanick [Wed, 16 Sep 2009 14:57:19 +0000 (07:57 -0700)]
Merge branch 'mesa_7_5_branch' into mesa_7_6_branch
Conflicts:
src/mesa/main/dlist.c
Ian Romanick [Wed, 16 Sep 2009 14:39:58 +0000 (07:39 -0700)]
intel: Deassociated drawables from private context struct in intelUnbindContext
The generic DRI infrastructure makes sure that __DRIcontextRec::driDrawablePriv
and __DRIcontextRec::driReadablePriv are set to NULL after unbinding a
context. However, the intel_context structure keeps cached copies of
these pointers. If these cached pointers are not NULLed and the
drawable is actually destroyed after unbinding the context (typically
by way of glXDestroyWindow), freed memory will be dereferenced in
intelDestroyContext.
This should fix bug #23418.
José Fonseca [Wed, 16 Sep 2009 13:31:14 +0000 (14:31 +0100)]
gallium: Deprecate PIPE_CAP_S3TC.
No longer used. S3TC support is queried via
pipe_screen::is_format_supported.
Michal Krol [Wed, 16 Sep 2009 12:56:58 +0000 (13:56 +0100)]
softpipe: Do not advertise Z32_UNORM as a supported format.
José Fonseca [Wed, 16 Sep 2009 09:39:29 +0000 (10:39 +0100)]
gdi: Integrate with llvmpipe where available.
José Fonseca [Wed, 16 Sep 2009 09:39:06 +0000 (10:39 +0100)]
llvmpipe: Make the code portable for MinGW.
Zou Nan hai [Wed, 16 Sep 2009 05:25:46 +0000 (13:25 +0800)]
i965: do a flush in clear, fix openarena render issue,
fd.o bug# 23857
Dave Airlie [Wed, 16 Sep 2009 03:48:45 +0000 (13:48 +1000)]
radeon: cleanup compile defines mess.
I inherited this and really it stayed around far too long,
make it nice and simple.
Dave Airlie [Wed, 16 Sep 2009 03:25:02 +0000 (13:25 +1000)]
radeon: oops remove debugging left on in previous patch
Dave Airlie [Wed, 16 Sep 2009 03:07:02 +0000 (13:07 +1000)]
radeon: use txformat to decide to emit rect tex state.
This is more logical, and fixes a TFP issue.
Brian Paul [Wed, 16 Sep 2009 00:16:59 +0000 (18:16 -0600)]
mesa: move generate mipmap calls
Per the suggestion in the Intel driver, move the calls to
ctx->Driver.GenerateMipmap() into core Mesa so that drivers don't
have to worry about it.
Brian Paul [Wed, 16 Sep 2009 00:09:03 +0000 (18:09 -0600)]
mesa: minor clean-up
Brian Paul [Tue, 15 Sep 2009 23:41:40 +0000 (17:41 -0600)]
mesa: remove last of gotos
Brian Paul [Tue, 15 Sep 2009 23:36:35 +0000 (17:36 -0600)]
mesa: more goto removal
Brian Paul [Tue, 15 Sep 2009 23:32:01 +0000 (17:32 -0600)]
mesa: remove some gotos
This will make some subsequent changes easier...
Brian Paul [Tue, 15 Sep 2009 23:20:32 +0000 (17:20 -0600)]
mesa: clean-up fbo debug code
Brian Paul [Tue, 15 Sep 2009 23:13:49 +0000 (17:13 -0600)]
progs/demos: use non-default texobj in cubemap.c
Brian Paul [Tue, 15 Sep 2009 23:08:33 +0000 (17:08 -0600)]
progs/demos: create a texture object in lodbias.c
Before, we were using the default texture object (name=0). This caused
the intel_generate_mipmap() path to fail since passing texture=0 to
glFramebufferTexture2DEXT() causes us to _unbind_ the texture if present.
Zack Rusin [Tue, 15 Sep 2009 15:01:21 +0000 (11:01 -0400)]
st/xorg: fixing copies and composite shaders
copies were busted when src == dst. also the composite shaders
were incorrectly using the fragments instead of the texture coordinate.
Zack Rusin [Tue, 15 Sep 2009 13:02:20 +0000 (09:02 -0400)]
st/xorg: lots of fixes
fixes blending binding and copy coordinates
Brian Paul [Tue, 15 Sep 2009 22:01:33 +0000 (16:01 -0600)]
docs: GL_ARB_provoking_vertex
Brian Paul [Tue, 15 Sep 2009 22:01:22 +0000 (16:01 -0600)]
mesa: added GL_ARB_provoking_vertex (same as EXT version)
Alex Deucher [Tue, 15 Sep 2009 21:12:03 +0000 (17:12 -0400)]
radeon: don't build non-r600 span code on r600
Alex Deucher [Tue, 15 Sep 2009 20:58:37 +0000 (16:58 -0400)]
r600: minor span cleanups
Brian Paul [Tue, 15 Sep 2009 21:12:29 +0000 (15:12 -0600)]
docs: glUniform functions are now compiled into display lists