Skip to content
  • Michał Król's avatar
    Merge branch 'master' into gallium-sampler-view · 3ce43759
    Michał Król authored
    Conflicts:
    	src/gallium/auxiliary/Makefile
    	src/gallium/auxiliary/SConscript
    	src/gallium/auxiliary/tgsi/tgsi_exec.c
    	src/gallium/auxiliary/util/u_blitter.c
    	src/gallium/drivers/i915/i915_context.h
    	src/gallium/drivers/i965/brw_context.h
    	src/gallium/drivers/llvmpipe/lp_context.h
    	src/gallium/drivers/nv50/nv50_context.h
    	src/gallium/drivers/nv50/nv50_state_validate.c
    	src/gallium/drivers/nv50/nv50_tex.c
    	src/gallium/drivers/r300/r300_blit.c
    	src/gallium/drivers/r300/r300_context.h
    	src/gallium/drivers/r300/r300_emit.c
    	src/gallium/drivers/r300/r300_state.c
    	src/gallium/drivers/softpipe/sp_context.h
    	src/gallium/drivers/svga/svga_context.h
    	src/gallium/drivers/svga/svga_pipe_sampler.c
    3ce43759