aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Move the remaining format pf_get_* functions to u_format.h.Michal Krol2009-12-1750-360/+322
| | | | | Previously they depended on format blocks, but after removing those they started depending on format encoding.
* util: Remove util_format_get_block().Michal Krol2009-12-171-23/+0
|
* Merge branch 'master' into pipe-format-simplifyMichal Krol2009-12-17418-18103/+19158
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/gallium/auxiliary/draw/draw_pipe_aaline.c src/gallium/auxiliary/draw/draw_pipe_pstipple.c src/gallium/auxiliary/util/u_blit.c src/gallium/auxiliary/util/u_gen_mipmap.c src/gallium/auxiliary/util/u_surface.c src/gallium/auxiliary/vl/vl_mpeg12_mc_renderer.c src/gallium/drivers/cell/ppu/cell_texture.c src/gallium/drivers/llvmpipe/lp_texture.c src/gallium/drivers/r300/r300_emit.c src/gallium/drivers/r300/r300_texture.c src/gallium/drivers/softpipe/sp_texture.c src/gallium/drivers/softpipe/sp_tile_cache.c src/gallium/drivers/svga/svga_state_vs.c src/gallium/include/pipe/p_format.h src/gallium/state_trackers/dri/dri_drawable.c src/gallium/state_trackers/egl/egl_surface.c src/gallium/state_trackers/python/p_device.i src/gallium/state_trackers/python/st_softpipe_winsys.c src/gallium/state_trackers/vega/api_filters.c src/gallium/state_trackers/vega/image.c src/gallium/state_trackers/vega/mask.c src/gallium/state_trackers/vega/paint.c src/gallium/state_trackers/vega/renderer.c src/gallium/state_trackers/vega/vg_tracker.c src/gallium/state_trackers/xorg/xorg_crtc.c src/gallium/state_trackers/xorg/xorg_dri2.c src/gallium/state_trackers/xorg/xorg_exa.c src/gallium/state_trackers/xorg/xorg_renderer.c src/gallium/state_trackers/xorg/xorg_xv.c src/gallium/state_trackers/xorg/xvmc/surface.c src/gallium/winsys/drm/nouveau/drm/nouveau_drm_api.c src/gallium/winsys/drm/radeon/core/radeon_buffer.c src/gallium/winsys/egl_xlib/sw_winsys.c src/gallium/winsys/g3dvl/xlib/xsp_winsys.c src/gallium/winsys/gdi/gdi_llvmpipe_winsys.c src/gallium/winsys/gdi/gdi_softpipe_winsys.c src/gallium/winsys/xlib/xlib_cell.c src/gallium/winsys/xlib/xlib_llvmpipe.c src/gallium/winsys/xlib/xlib_softpipe.c src/mesa/state_tracker/st_cb_fbo.c src/mesa/state_tracker/st_cb_texture.c src/mesa/state_tracker/st_texture.c
| * glsl/apps: Add dummy install target to fix 'make install'Sedat Dilek2009-12-171-1/+2
| | | | | | | | Signed-off-by: Brian Paul <[email protected]>
| * configure.ac: Add glsl to SRC_DIRSSedat Dilek2009-12-171-1/+1
| | | | | | | | Signed-off-by: Brian Paul <[email protected]>
| * Merge branch 'glsl-pp-rework-2'Michal Krol2009-12-1780-12956/+9164
| |\
| | * Remove grammar module -- no dependencies left.Michal Krol2009-12-1217-4388/+8
| | |
| | * slang: Delete a file that is now autogenerated.Michal Krol2009-12-121-880/+0
| | | | | | | | | | | | | | | | | | 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.
| | * Merge branch 'master' into glsl-pp-rework-2Michal Krol2009-12-121692-93859/+874484
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| | * | scons: Get GLSL code building correctly when cross compiling.José Fonseca2009-12-108-75/+97
| | | | | | | | | | | | | | | | | | | | This is quite messy. GLSL code has to be built twice: one for the host OS, another for the target OS.
| | * | glsl/sl: fix _parse_boolconstant()Brian Paul2009-12-101-0/+2
| | | | | | | | | | | | | | | | | | | | Need to emit the radix before the digits. This fixes several glean/glgl1 regressions.
| | * | mesa: added new libglslpp.a and libglslcl.a to libGL buildBrian Paul2009-12-102-5/+10
| | | |
| | * | glsl/apps: remove unused varsBrian Paul2009-12-104-7/+0
| | | |
| | * | glsl/pp: make some functions staticBrian Paul2009-12-101-3/+3
| | | |
| | * | glsl/pp: declare sl_pp_purify_options to silence warningBrian Paul2009-12-101-0/+2
| | | |
| | * | glsl/cl: silence unused var warningBrian Paul2009-12-101-0/+2
| | | |
| | * | slang: Predefine ES symbols for FEATURE_es2_glsl.Michal Krol2009-12-101-0/+9
| | | |
| | * | glsl/apps: Predefine __GLSL_PP_PREDEFINED_MACRO_TEST for testing.Michal Krol2009-12-101-0/+10
| | | |
| | * | glsl/pp: Add support for user-defined macros.Michal Krol2009-12-104-0/+57
| | | |
| | * | glsl/apps: Explicitly add ARB_draw_buffers and ARB_texture_rectangle.Michal Krol2009-12-102-0/+22
| | | |
| | * | slang: Explicitly enable ARB_draw_buffers and ARB_texture_rectangle.Michal Krol2009-12-101-0/+7
| | | | | | | | | | | | | | | | They are no longer built into the glsl preprocessor.
| | * | glsl/pp: Add sl_pp_context_add_extension().Michal Krol2009-12-106-16/+64
| | | | | | | | | | | | | | | | This way third parties are able to add supported extension strings.
| | * | Build mesa glsl with make.michal2009-12-109-43/+179
| | | | | | | | | | | | | | | | Still don't know how to add glsl to mesa dependencies.
| | * | glsl/apps: Make compile more shell friendly.Michal Krol2009-11-251-8/+27
| | | |
| | * | slang/library: Don't need the *_gc.h files, they are autogenerated now.Michal Krol2009-11-257-2828/+0
| | | |
| | * | scons: Autogenerate GLSL builtin library *_gc.h from *.gc files.Michal Krol2009-11-254-3/+50
| | | |
| | * | slang: Fix order of parameters to sl_pp_tokenise().Michal Krol2009-11-231-1/+1
| | | |
| | * | glsl/apps: No need to purify source text for tokeniser.Michal Krol2009-11-214-60/+16
| | | |
| | * | slang: No need to purify source text for tokeniser.Michal Krol2009-11-211-12/+2
| | | |
| | * | glsl/pp: Do purification and tokenisation in a single step.Michal Krol2009-11-216-307/+561
| | | |
| | * | glsl/pp: Expand unknown identifiers to 0 in if/elif expressions.Michal Krol2009-11-205-8/+22
| | | |
| | * | glsl/pp: Fix macro formal argument parsing, more descriptive error msgs.Michal Krol2009-11-171-3/+4
| | | |
| | * | glsl/apps: Report syntax parser errors.Michal Krol2009-11-131-1/+4
| | | |
| | * | slang: Report syntax parser errors.Michal Krol2009-11-131-5/+10
| | | |
| | * | glsl/cl: Add simple error reporting.Michal Krol2009-11-132-8/+74
| | | |
| | * | slang: Regenerate .gc files.Michal Krol2009-11-135-2590/+2581
| | | |
| | * | slang: Get rid of the old syntax file and utilities.Michal Krol2009-11-135-2400/+0
| | | |
| | * | slang: Plug in the new syntax parser.Michal Krol2009-11-131-57/+58
| | | |
| | * | gdi: Link to glslcl.Michal Krol2009-11-131-1/+1
| | | |
| | * | glsl/apps: Add GLSL compiler that translates source text into binary stream.Michal Krol2009-11-132-1/+219
| | | | | | | | | | | | | | | | Should be used in place of gc_to_bin utility to precompile builtin library.
| | * | glsl/cl: Add a hard-coded syntax parser.Michal Krol2009-11-134-0/+2697
| | | |
| | * | glsl/pp: Add sl_pp_purify_getc().Michal Krol2009-11-102-87/+133
| | | |
| | * | slang: Update for glsl/pp interface changes.Michal Krol2009-11-101-2/+4
| | | |
| | * | glsl/apps: Update for glsl/pp interface changes.Michal Krol2009-11-104-8/+16
| | | |
| | * | glsl/pp: Have sl_pp_purify() return error msg/line no.Michal Krol2009-11-102-11/+50
| | | |
| | * | glsl/pp: Expand macro actual arguments before pasting into its body.Michal Krol2009-09-281-49/+53
| | | |
| | * | glsl/pp: Add forward decls to silence gcc warnings.Michal Krol2009-09-242-0/+5
| | | |
| | * | glsl/pp: Avoid using `__VERSION__' as an identifier.Michal Krol2009-09-243-3/+7
| | | |
| | * | glsl/pp: Include missing headers.Michal Krol2009-09-2410-0/+11
| | | |
| | * | glsl/pp: Allow builds on all platforms.Michal Krol2009-09-241-3/+0
| | | |