Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Move the remaining format pf_get_* functions to u_format.h. | Michal Krol | 2009-12-17 | 50 | -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 Krol | 2009-12-17 | 1 | -23/+0 |
| | |||||
* | Merge branch 'master' into pipe-format-simplify | Michal Krol | 2009-12-17 | 418 | -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 Dilek | 2009-12-17 | 1 | -1/+2 |
| | | | | | | | | Signed-off-by: Brian Paul <[email protected]> | ||||
| * | configure.ac: Add glsl to SRC_DIRS | Sedat Dilek | 2009-12-17 | 1 | -1/+1 |
| | | | | | | | | Signed-off-by: Brian Paul <[email protected]> | ||||
| * | Merge branch 'glsl-pp-rework-2' | Michal Krol | 2009-12-17 | 80 | -12956/+9164 |
| |\ | |||||
| | * | Remove grammar module -- no dependencies left. | Michal Krol | 2009-12-12 | 17 | -4388/+8 |
| | | | |||||
| | * | slang: Delete a file that is now autogenerated. | Michal Krol | 2009-12-12 | 1 | -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-2 | Michal Krol | 2009-12-12 | 1692 | -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é Fonseca | 2009-12-10 | 8 | -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 Paul | 2009-12-10 | 1 | -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 build | Brian Paul | 2009-12-10 | 2 | -5/+10 |
| | | | | |||||
| | * | | glsl/apps: remove unused vars | Brian Paul | 2009-12-10 | 4 | -7/+0 |
| | | | | |||||
| | * | | glsl/pp: make some functions static | Brian Paul | 2009-12-10 | 1 | -3/+3 |
| | | | | |||||
| | * | | glsl/pp: declare sl_pp_purify_options to silence warning | Brian Paul | 2009-12-10 | 1 | -0/+2 |
| | | | | |||||
| | * | | glsl/cl: silence unused var warning | Brian Paul | 2009-12-10 | 1 | -0/+2 |
| | | | | |||||
| | * | | slang: Predefine ES symbols for FEATURE_es2_glsl. | Michal Krol | 2009-12-10 | 1 | -0/+9 |
| | | | | |||||
| | * | | glsl/apps: Predefine __GLSL_PP_PREDEFINED_MACRO_TEST for testing. | Michal Krol | 2009-12-10 | 1 | -0/+10 |
| | | | | |||||
| | * | | glsl/pp: Add support for user-defined macros. | Michal Krol | 2009-12-10 | 4 | -0/+57 |
| | | | | |||||
| | * | | glsl/apps: Explicitly add ARB_draw_buffers and ARB_texture_rectangle. | Michal Krol | 2009-12-10 | 2 | -0/+22 |
| | | | | |||||
| | * | | slang: Explicitly enable ARB_draw_buffers and ARB_texture_rectangle. | Michal Krol | 2009-12-10 | 1 | -0/+7 |
| | | | | | | | | | | | | | | | | They are no longer built into the glsl preprocessor. | ||||
| | * | | glsl/pp: Add sl_pp_context_add_extension(). | Michal Krol | 2009-12-10 | 6 | -16/+64 |
| | | | | | | | | | | | | | | | | This way third parties are able to add supported extension strings. | ||||
| | * | | Build mesa glsl with make. | michal | 2009-12-10 | 9 | -43/+179 |
| | | | | | | | | | | | | | | | | Still don't know how to add glsl to mesa dependencies. | ||||
| | * | | glsl/apps: Make compile more shell friendly. | Michal Krol | 2009-11-25 | 1 | -8/+27 |
| | | | | |||||
| | * | | slang/library: Don't need the *_gc.h files, they are autogenerated now. | Michal Krol | 2009-11-25 | 7 | -2828/+0 |
| | | | | |||||
| | * | | scons: Autogenerate GLSL builtin library *_gc.h from *.gc files. | Michal Krol | 2009-11-25 | 4 | -3/+50 |
| | | | | |||||
| | * | | slang: Fix order of parameters to sl_pp_tokenise(). | Michal Krol | 2009-11-23 | 1 | -1/+1 |
| | | | | |||||
| | * | | glsl/apps: No need to purify source text for tokeniser. | Michal Krol | 2009-11-21 | 4 | -60/+16 |
| | | | | |||||
| | * | | slang: No need to purify source text for tokeniser. | Michal Krol | 2009-11-21 | 1 | -12/+2 |
| | | | | |||||
| | * | | glsl/pp: Do purification and tokenisation in a single step. | Michal Krol | 2009-11-21 | 6 | -307/+561 |
| | | | | |||||
| | * | | glsl/pp: Expand unknown identifiers to 0 in if/elif expressions. | Michal Krol | 2009-11-20 | 5 | -8/+22 |
| | | | | |||||
| | * | | glsl/pp: Fix macro formal argument parsing, more descriptive error msgs. | Michal Krol | 2009-11-17 | 1 | -3/+4 |
| | | | | |||||
| | * | | glsl/apps: Report syntax parser errors. | Michal Krol | 2009-11-13 | 1 | -1/+4 |
| | | | | |||||
| | * | | slang: Report syntax parser errors. | Michal Krol | 2009-11-13 | 1 | -5/+10 |
| | | | | |||||
| | * | | glsl/cl: Add simple error reporting. | Michal Krol | 2009-11-13 | 2 | -8/+74 |
| | | | | |||||
| | * | | slang: Regenerate .gc files. | Michal Krol | 2009-11-13 | 5 | -2590/+2581 |
| | | | | |||||
| | * | | slang: Get rid of the old syntax file and utilities. | Michal Krol | 2009-11-13 | 5 | -2400/+0 |
| | | | | |||||
| | * | | slang: Plug in the new syntax parser. | Michal Krol | 2009-11-13 | 1 | -57/+58 |
| | | | | |||||
| | * | | gdi: Link to glslcl. | Michal Krol | 2009-11-13 | 1 | -1/+1 |
| | | | | |||||
| | * | | glsl/apps: Add GLSL compiler that translates source text into binary stream. | Michal Krol | 2009-11-13 | 2 | -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 Krol | 2009-11-13 | 4 | -0/+2697 |
| | | | | |||||
| | * | | glsl/pp: Add sl_pp_purify_getc(). | Michal Krol | 2009-11-10 | 2 | -87/+133 |
| | | | | |||||
| | * | | slang: Update for glsl/pp interface changes. | Michal Krol | 2009-11-10 | 1 | -2/+4 |
| | | | | |||||
| | * | | glsl/apps: Update for glsl/pp interface changes. | Michal Krol | 2009-11-10 | 4 | -8/+16 |
| | | | | |||||
| | * | | glsl/pp: Have sl_pp_purify() return error msg/line no. | Michal Krol | 2009-11-10 | 2 | -11/+50 |
| | | | | |||||
| | * | | glsl/pp: Expand macro actual arguments before pasting into its body. | Michal Krol | 2009-09-28 | 1 | -49/+53 |
| | | | | |||||
| | * | | glsl/pp: Add forward decls to silence gcc warnings. | Michal Krol | 2009-09-24 | 2 | -0/+5 |
| | | | | |||||
| | * | | glsl/pp: Avoid using `__VERSION__' as an identifier. | Michal Krol | 2009-09-24 | 3 | -3/+7 |
| | | | | |||||
| | * | | glsl/pp: Include missing headers. | Michal Krol | 2009-09-24 | 10 | -0/+11 |
| | | | | |||||
| | * | | glsl/pp: Allow builds on all platforms. | Michal Krol | 2009-09-24 | 1 | -3/+0 |
| | | | |