Merge branch 'draw-instanced'
Conflicts: src/gallium/auxiliary/draw/draw_llvm.c src/gallium/drivers/llvmpipe/lp_state_fs.c src/glsl/ir_set_program_inouts.cpp src/mesa/tnl/t_vb_program.c
This commit is contained in:
@@ -380,6 +380,7 @@ _mesa_enable_sw_extensions(struct gl_context *ctx)
|
||||
ctx->Extensions.ARB_depth_texture = GL_TRUE;
|
||||
/*ctx->Extensions.ARB_draw_buffers = GL_TRUE;*/
|
||||
ctx->Extensions.ARB_draw_elements_base_vertex = GL_TRUE;
|
||||
ctx->Extensions.ARB_draw_instanced = GL_TRUE;
|
||||
ctx->Extensions.ARB_explicit_attrib_location = GL_TRUE;
|
||||
ctx->Extensions.ARB_fragment_coord_conventions = GL_TRUE;
|
||||
#if FEATURE_ARB_fragment_program
|
||||
|
Reference in New Issue
Block a user