Module: Mesa Branch: master Commit: ecfaab88b2577bd0395bc05d75a036126806a9c4 URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=ecfaab88b2577bd0395bc05d75a036126806a9c4
Author: Brian Paul <[email protected]> Date: Sun Apr 10 12:44:46 2011 -0600 mesa: move sampler state into new gl_sampler_object type gl_texture_object contains an instance of this type for the regular texture object sampling state. glGenSamplers() generates new instances of gl_sampler_object which can override that state with glBindSampler(). --- src/mesa/drivers/common/meta.c | 18 +- src/mesa/drivers/dri/common/texmem.c | 7 +- src/mesa/drivers/dri/i810/i810tex.c | 12 +- src/mesa/drivers/dri/i915/i830_texstate.c | 24 +- src/mesa/drivers/dri/i915/i915_texstate.c | 38 ++-- src/mesa/drivers/dri/i965/brw_draw.c | 12 +- src/mesa/drivers/dri/i965/brw_wm.c | 8 +- src/mesa/drivers/dri/i965/brw_wm_sampler_state.c | 34 ++-- src/mesa/drivers/dri/i965/brw_wm_surface_state.c | 5 +- src/mesa/drivers/dri/intel/intel_tex_image.c | 4 +- src/mesa/drivers/dri/intel/intel_tex_validate.c | 2 +- src/mesa/drivers/dri/mach64/mach64_tex.c | 12 +- src/mesa/drivers/dri/mga/mgatex.c | 12 +- src/mesa/drivers/dri/nouveau/nouveau_texture.c | 4 +- src/mesa/drivers/dri/nouveau/nv04_state_tex.c | 12 +- src/mesa/drivers/dri/nouveau/nv10_state_tex.c | 12 +- src/mesa/drivers/dri/nouveau/nv20_state_tex.c | 14 +- src/mesa/drivers/dri/r128/r128_tex.c | 12 +- src/mesa/drivers/dri/r200/r200_tex.c | 18 +- src/mesa/drivers/dri/r300/r300_fragprog_common.c | 4 +- src/mesa/drivers/dri/r300/r300_state.c | 4 +- src/mesa/drivers/dri/r300/r300_tex.c | 18 +- src/mesa/drivers/dri/r300/r300_texstate.c | 2 +- src/mesa/drivers/dri/r600/evergreen_tex.c | 16 +- src/mesa/drivers/dri/r600/r600_tex.c | 16 +- src/mesa/drivers/dri/r600/r700_chip.c | 4 +- src/mesa/drivers/dri/radeon/radeon_mipmap_tree.c | 6 +- src/mesa/drivers/dri/radeon/radeon_tex.c | 18 +- src/mesa/drivers/dri/savage/savagerender.c | 12 +- src/mesa/drivers/dri/savage/savagetex.c | 12 +- src/mesa/drivers/dri/sis/sis_texstate.c | 22 +- src/mesa/drivers/dri/tdfx/tdfx_tex.c | 8 +- src/mesa/drivers/dri/unichrome/via_state.c | 32 ++-- src/mesa/drivers/dri/unichrome/via_tex.c | 6 +- src/mesa/main/attrib.c | 25 ++- src/mesa/main/ff_fragment_shader.cpp | 7 +- src/mesa/main/mtypes.h | 60 ++++-- src/mesa/main/texfetch.c | 2 +- src/mesa/main/texobj.c | 90 ++++---- src/mesa/main/texparam.c | 160 +++++++------- src/mesa/main/texstate.c | 8 +- src/mesa/program/prog_statevars.c | 2 +- src/mesa/state_tracker/st_atom_sampler.c | 31 ++- src/mesa/state_tracker/st_atom_texture.c | 18 +- src/mesa/state_tracker/st_cb_texture.c | 12 +- src/mesa/state_tracker/st_texture.h | 15 ++ src/mesa/swrast/s_fragprog.c | 6 +- src/mesa/swrast/s_span.c | 2 +- src/mesa/swrast/s_texcombine.c | 22 +- src/mesa/swrast/s_texfilter.c | 255 +++++++++++----------- src/mesa/swrast/s_triangle.c | 12 +- 51 files changed, 620 insertions(+), 547 deletions(-) Diff: http://cgit.freedesktop.org/mesa/mesa/diff/?id=ecfaab88b2577bd0395bc05d75a036126806a9c4 _______________________________________________ mesa-commit mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/mesa-commit
