summaryrefslogtreecommitdiffstats
path: root/src/mesa/main
Commit message (Expand)AuthorAgeFilesLines
* Merge remote-tracking branch 'mesa-public/master' into vulkanJason Ekstrand2015-10-0210-181/+137
|\
| * mesa: Add abs input modifier to base for POW in ffvertex_progDaniel Scharrer2015-10-011-3/+14
| * mesa: fix incorrect error in _mesa_BindTextureUnit()Brian Paul2015-10-011-1/+2
| * mesa: remove _mesa_get_tex_unit_err() and fix error handlingBrian Paul2015-10-012-20/+7
| * mesa: consolidate texture binding codeBrian Paul2015-10-011-121/+79
| * mesa: fix indentation in _mesa_create_nameless_texture()Brian Paul2015-10-011-9/+9
| * mesa: clean up #includes in uniforms.hBrian Paul2015-10-011-3/+3
| * mesa: clean up #includes in uniform_query.cppBrian Paul2015-10-011-7/+6
| * mesa: clean up #includes in pipelineobj.cBrian Paul2015-10-011-3/+3
| * mesa: clean up #includes in ff_fragment_shader.cppBrian Paul2015-10-011-12/+10
| * main: Fix block index when mixing UBO and SSBO blocksIago Toral Quiroga2015-10-011-3/+2
| * mesa: use strtok_s for strtok_r on windowsTapani Pälli2015-10-011-0/+3
| * mesa: Fix format specifier warning in mesa_DispatchComputeIndirect()Rhys Kidd2015-09-301-1/+1
* | Merge branch 'master' of ../mesa into vulkanKristian Høgsberg Kristensen2015-10-0154-1563/+2673
|\|
| * mesa: clean up #includes in shaderapi.cBrian Paul2015-09-291-5/+5
| * mesa: clean up the #includes in shader_query.cppBrian Paul2015-09-291-7/+7
| * mesa: remove an extern "C" wrapper in shader_query.cppBrian Paul2015-09-291-3/+1
| * mesa/cs: Add MESA_VERBOSE=api support in DispatchCompute*Jordan Justen2015-09-291-0/+7
| * mesa: fix ARRAY_SIZE query for GetProgramResourceivTapani Pälli2015-09-293-43/+62
| * util: implement strndup for WIN32Samuel Iglesias Gonsalvez2015-09-291-0/+1
| * mesa: rename gl_shader_program's NumUniformBlocks to NumBufferInterfaceBlocksSamuel Iglesias Gonsalvez2015-09-294-8/+8
| * main: fix ACTIVE_UNIFORM_BLOCKS valueSamuel Iglesias Gonsalvez2015-09-291-1/+5
| * mesa: Use the effective internal format instead for validationEduardo Lima Mitev2015-09-281-0/+151
| * mesa: Move _mesa_base_tex_format() from teximage to glformats filesEduardo Lima Mitev2015-09-284-378/+507
| * mesa: Fix order of format+type and internal format checks for glTexImageXD opsEduardo Lima Mitev2015-09-281-16/+25
| * mesa: don't leak interface_nameIlia Mirkin2015-09-281-0/+1
| * main/tests: Enable glShaderStorageBlockBinding() check in dispatch_sanity testSamuel Iglesias Gonsalvez2015-09-261-1/+1
| * mesa: Add locking to programs.Matt Turner2015-09-251-0/+1
| * mesa: Add locking to sampler objects.Matt Turner2015-09-252-4/+7
| * mesa: Remove debugging code from _mesa_reference_*.Matt Turner2015-09-255-47/+0
| * mesa: Add getters for the GL_ARB_shader_storage_buffer_object max constantsSamuel Iglesias Gonsalvez2015-09-252-0/+23
| * main/tests: add ARB_shader_storage_buffer_object tokens to enum_stringsSamuel Iglesias Gonsalvez2015-09-251-0/+15
| * main: Add SHADER_STORAGE_BLOCK and BUFFER_VARIABLE support for ARB_program_in...Samuel Iglesias Gonsalvez2015-09-252-9/+263
| * glsl: fix UNIFORM_BUFFER_START or UNIFORM_BUFFER_SIZE query when no buffer ob...Samuel Iglesias Gonsalvez2015-09-251-2/+4
| * mesa: Add queries for GL_SHADER_STORAGE_BUFFERIago Toral Quiroga2015-09-251-0/+31
| * mesa: add glShaderStorageBlockBinding()Samuel Iglesias Gonsalvez2015-09-252-0/+56
| * glsl: Add parser/compiler support for std430 interface packing qualifierSamuel Iglesias Gonsalvez2015-09-251-1/+2
| * mesa: set MAX_SHADER_STORAGE_BUFFERS to 16.Samuel Iglesias Gonsalvez2015-09-251-1/+1
| * mesa: add packed_varyings list to gl_shaderTapani Pälli2015-09-251-0/+1
| * mesa/cs: Implement glDispatchComputeIndirectJordan Justen2015-09-244-6/+73
| * mesa/cs: Support GL_DISPATCH_INDIRECT_BUFFERJordan Justen2015-09-244-0/+21
| * mesa/cs: Add _mesa_validate_DispatchComputeJordan Justen2015-09-243-23/+53
| * mesa: fix mipmap generation for immutable, compressed texturesRoland Scheidegger2015-09-251-21/+15
| * mesa: rework Driver.CopyImageSubData() and related codeBrian Paul2015-09-242-135/+181
| * mesa: Fix GL_FRAMEBUFFER_ATTACHMENT_OBJECT_TYPE for default framebuffer.Iago Toral Quiroga2015-09-231-1/+10
| * glsl: bail out early in _mesa_ShaderSource if no shaderobjTapani Pälli2015-09-231-11/+9
| * mesa: const-qualify _mesa_is_legal_tex_storage_format ctx paramBrian Paul2015-09-222-2/+4
| * mesa: const-qualify _mesa_base_tex_format() ctx paramBrian Paul2015-09-222-2/+2
| * mesa: const-qualify buffer_object_subdata_range_good() bufObj parameterBrian Paul2015-09-221-1/+1
| * mesa: whitespace, comment fixes in texstorage.cBrian Paul2015-09-221-15/+18