summaryrefslogtreecommitdiffstats
path: root/src/mesa/main
Commit message (Expand)AuthorAgeFilesLines
* Merge commit mesa-public/master into vulkanJason Ekstrand2016-02-0510-25/+25
|\
| * glsl: move to compiler/Emil Velikov2016-01-269-21/+21
| * nir: move glsl_types.{cpp,h} to compilerEmil Velikov2016-01-263-3/+3
| * nir: move shader_enums.[ch] to compilerEmil Velikov2016-01-261-1/+1
* | Merge branch mesa-public/master into vulkanJason Ekstrand2016-02-056-19/+8
|\|
| * mesa: Don't include meta.hIan Romanick2016-01-251-1/+0
| * Revert "mesa: enable enums for OES_geometry_shader"Marek Olšák2016-01-242-86/+30
| * Revert "mesa: Deal with size differences between GLuint and GLhandleARB in Ge...Jeremy Huddleston Sequoia2016-01-221-17/+1
| * mesa: Update _mesa_has_geometry_shadersMarta Lofstedt2016-01-221-1/+2
| * mesa: enable enums for OES_geometry_shaderMarta Lofstedt2016-01-222-30/+86
| * glapi: add GL_OES_geometry_shader extensionMarta Lofstedt2016-01-223-0/+5
* | Merge remote-tracking branch 'mattst88/nir-lower-pack-unpack' into vulkanJason Ekstrand2016-01-2514-101/+108
|\|
| * mesa: wire up EmitStringMarker for KHR_debugRob Clark2016-01-211-0/+7
| * mesa: add GREMEDY_string_markerRob Clark2016-01-216-0/+28
| * texobj: Remove redundant checks that the texture cube faces match sizeNeil Roberts2016-01-211-10/+0
| * texobj: Fix the completeness checks for cube texturesNeil Roberts2016-01-211-1/+11
| * mesa: Deal with size differences between GLuint and GLhandleARB in GetAttache...Jeremy Huddleston Sequoia2016-01-211-1/+17
| * mesa: Fix format warningsJeremy Huddleston Sequoia2016-01-211-1/+1
| * mesa: Fix some function prototype mismatchingJeremy Huddleston Sequoia2016-01-214-27/+26
| * mesa: remove link validation that should be done elsewhereTimothy Arceri2016-01-201-60/+3
| * mesa: Move sanity check of BindVertexBuffer for OpenGL ES 3.1Marta Lofstedt2016-01-192-1/+5
| * mesa: fix segfault in glUniformSubroutinesuiv()Timothy Arceri2016-01-181-0/+10
* | Merge remote-tracking branch 'mesa-public/master' into vulkanJason Ekstrand2016-01-145-13/+34
|\|
| * mesa: add Driver.InvalidateBufferSubDataNicolai Hähnle2016-01-142-8/+9
| * mesa: fix the checks in _mesa_InvalidateBuffer(Sub)DataNicolai Hähnle2016-01-141-3/+15
| * texobj: Check completeness with InternalFormat rather than Mesa formatNeil Roberts2016-01-141-1/+1
| * mesa: do not validate io of non-compute and compute stageTapani Pälli2016-01-131-0/+7
| * mesa: print the invalid enum when CreateShader failsTimothy Arceri2016-01-131-1/+2
* | Merge ../mesa into vulkanKristian Høgsberg Kristensen2016-01-128-51/+182
|\|
| * mesa: use gl_shader_variable in program resource listTapani Pälli2016-01-122-19/+80
| * main: get rid of needless conditionalErik Faye-Lund2016-01-121-13/+12
| * mesa: Refator _mesa_BindSampler to make _mesa_bind_samplerIan Romanick2016-01-112-6/+16
| * mesa: Add _mesa_set_sampler_srgb_decode methodIan Romanick2016-01-112-0/+14
| * mesa: Add _mesa_set_sampler_filters methodIan Romanick2016-01-112-0/+26
| * mesa: Add _mesa_set_sampler_wrap methodIan Romanick2016-01-112-0/+20
| * mesa/uniform_query: add IROUNDD and use for doubles->ints (v2)Dave Airlie2016-01-112-1/+8
| * mesa: Update todo regarding StencilOp and StencilOpSeparate.Rhys Kidd2016-01-111-12/+6
* | Merge ../mesa into vulkanKristian Høgsberg Kristensen2016-01-0817-460/+505
|\|
| * mesa: merge bind_atomic_buffers_{base|range}Nicolai Hähnle2016-01-081-106/+49
| * mesa: merge bind_shader_storage_buffers_{base|range}Nicolai Hähnle2016-01-081-111/+51
| * mesa: merge bind_uniform_buffers_{base|range}Nicolai Hähnle2016-01-081-108/+50
| * mesa: merge bind_xfb_buffers_{base|range}Nicolai Hähnle2016-01-081-113/+59
| * mesa: Use separate indices for UBO & SSBO during bindingJordan Justen2016-01-081-10/+20
| * mesa: Map program UBOs and SSBOs to Interface BlocksJordan Justen2016-01-081-0/+7
| * mesa/main: Avoid `void function returning a value` warning.Jose Fonseca2016-01-081-2/+4
| * glsl: optionally declare gl_FragCoord & gl_FrontFacing as system valuesMarek Olšák2016-01-081-0/+4
| * mesa: check that internalformat of CopyTexImage*D is not 1, 2, 3, 4Nicolai Hähnle2016-01-081-0/+16
| * mesa: add support for ARB_indirect_parameters draw functionsIlia Mirkin2016-01-072-0/+131
| * mesa: add parameter buffer, used for ARB_indirect_parametersIlia Mirkin2016-01-074-0/+25
| * glapi: add ARB_indirect_parameters definitionsIlia Mirkin2016-01-073-0/+6