projects / mesa.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
Merge remote branch 'origin/master' into pipe-video
[mesa.git] / src / mapi / glapi / glapi_x86.S
diff --git a/src/mapi/glapi/glapi_x86.S b/src/mapi/glapi/glapi_x86.S
index 3e86b191f5d97917610a80d853d853c525a25179..670a45f83b54383e9960084befea1080f9ce9a04 100644 (file)
--- a/src/mapi/glapi/glapi_x86.S
+++ b/src/mapi/glapi/glapi_x86.S
@@ -976,48 +976,85 @@ GLNAME(gl_dispatch_functions_start):
        HIDDEN(GL_PREFIX(_dispatch_stub_796, _dispatch_stub_796@12))
        GL_STUB(_dispatch_stub_797, 797, _dispatch_stub_797@12)
        HIDDEN(GL_PREFIX(_dispatch_stub_797, _dispatch_stub_797@12))
-       GL_STUB(FramebufferTextureLayerEXT, 798, FramebufferTextureLayerEXT@20)
-       GL_STUB(ColorMaskIndexedEXT, 799, ColorMaskIndexedEXT@20)
-       GL_STUB(DisableIndexedEXT, 800, DisableIndexedEXT@8)
-       GL_STUB(EnableIndexedEXT, 801, EnableIndexedEXT@8)
-       GL_STUB(GetBooleanIndexedvEXT, 802, GetBooleanIndexedvEXT@12)
-       GL_STUB(GetIntegerIndexedvEXT, 803, GetIntegerIndexedvEXT@12)
-       GL_STUB(IsEnabledIndexedEXT, 804, IsEnabledIndexedEXT@8)
-       GL_STUB(ClearColorIiEXT, 805, ClearColorIiEXT@16)
-       GL_STUB(ClearColorIuiEXT, 806, ClearColorIuiEXT@16)
-       GL_STUB(GetTexParameterIivEXT, 807, GetTexParameterIivEXT@12)
-       GL_STUB(GetTexParameterIuivEXT, 808, GetTexParameterIuivEXT@12)
-       GL_STUB(TexParameterIivEXT, 809, TexParameterIivEXT@12)
-       GL_STUB(TexParameterIuivEXT, 810, TexParameterIuivEXT@12)
-       GL_STUB(BeginConditionalRenderNV, 811, BeginConditionalRenderNV@8)
-       GL_STUB(EndConditionalRenderNV, 812, EndConditionalRenderNV@0)
-       GL_STUB(BeginTransformFeedbackEXT, 813, BeginTransformFeedbackEXT@4)
-       GL_STUB(BindBufferBaseEXT, 814, BindBufferBaseEXT@12)
-       GL_STUB(BindBufferOffsetEXT, 815, BindBufferOffsetEXT@16)
-       GL_STUB(BindBufferRangeEXT, 816, BindBufferRangeEXT@20)
-       GL_STUB(EndTransformFeedbackEXT, 817, EndTransformFeedbackEXT@0)
-       GL_STUB(GetTransformFeedbackVaryingEXT, 818, GetTransformFeedbackVaryingEXT@28)
-       GL_STUB(TransformFeedbackVaryingsEXT, 819, TransformFeedbackVaryingsEXT@16)
-       GL_STUB(ProvokingVertexEXT, 820, ProvokingVertexEXT@4)
-       GL_STUB(_dispatch_stub_821, 821, _dispatch_stub_821@12)
-       HIDDEN(GL_PREFIX(_dispatch_stub_821, _dispatch_stub_821@12))
-       GL_STUB(_dispatch_stub_822, 822, _dispatch_stub_822@12)
-       HIDDEN(GL_PREFIX(_dispatch_stub_822, _dispatch_stub_822@12))
-       GL_STUB(GetObjectParameterivAPPLE, 823, GetObjectParameterivAPPLE@16)
-       GL_STUB(ObjectPurgeableAPPLE, 824, ObjectPurgeableAPPLE@12)
-       GL_STUB(ObjectUnpurgeableAPPLE, 825, ObjectUnpurgeableAPPLE@12)
-       GL_STUB(_dispatch_stub_826, 826, _dispatch_stub_826@16)
-       HIDDEN(GL_PREFIX(_dispatch_stub_826, _dispatch_stub_826@16))
-       GL_STUB(_dispatch_stub_827, 827, _dispatch_stub_827@16)
-       HIDDEN(GL_PREFIX(_dispatch_stub_827, _dispatch_stub_827@16))
-       GL_STUB(_dispatch_stub_828, 828, _dispatch_stub_828@16)
-       HIDDEN(GL_PREFIX(_dispatch_stub_828, _dispatch_stub_828@16))
-       GL_STUB(_dispatch_stub_829, 829, _dispatch_stub_829@12)
-       HIDDEN(GL_PREFIX(_dispatch_stub_829, _dispatch_stub_829@12))
-       GL_STUB(_dispatch_stub_830, 830, _dispatch_stub_830@12)
-       HIDDEN(GL_PREFIX(_dispatch_stub_830, _dispatch_stub_830@12))
-       GL_STUB(EGLImageTargetRenderbufferStorageOES, 831, EGLImageTargetRenderbufferStorageOES@8)
-       GL_STUB(EGLImageTargetTexture2DOES, 832, EGLImageTargetTexture2DOES@8)
+       GL_STUB(BindFragDataLocationEXT, 798, BindFragDataLocationEXT@12)
+       GL_STUB(GetFragDataLocationEXT, 799, GetFragDataLocationEXT@8)
+       GL_STUB(GetUniformuivEXT, 800, GetUniformuivEXT@12)
+       GL_STUB(GetVertexAttribIivEXT, 801, GetVertexAttribIivEXT@12)
+       GL_STUB(GetVertexAttribIuivEXT, 802, GetVertexAttribIuivEXT@12)
+       GL_STUB(Uniform1uiEXT, 803, Uniform1uiEXT@8)
+       GL_STUB(Uniform1uivEXT, 804, Uniform1uivEXT@12)
+       GL_STUB(Uniform2uiEXT, 805, Uniform2uiEXT@12)
+       GL_STUB(Uniform2uivEXT, 806, Uniform2uivEXT@12)
+       GL_STUB(Uniform3uiEXT, 807, Uniform3uiEXT@16)
+       GL_STUB(Uniform3uivEXT, 808, Uniform3uivEXT@12)
+       GL_STUB(Uniform4uiEXT, 809, Uniform4uiEXT@20)
+       GL_STUB(Uniform4uivEXT, 810, Uniform4uivEXT@12)
+       GL_STUB(VertexAttribI1iEXT, 811, VertexAttribI1iEXT@8)
+       GL_STUB(VertexAttribI1ivEXT, 812, VertexAttribI1ivEXT@8)
+       GL_STUB(VertexAttribI1uiEXT, 813, VertexAttribI1uiEXT@8)
+       GL_STUB(VertexAttribI1uivEXT, 814, VertexAttribI1uivEXT@8)
+       GL_STUB(VertexAttribI2iEXT, 815, VertexAttribI2iEXT@12)
+       GL_STUB(VertexAttribI2ivEXT, 816, VertexAttribI2ivEXT@8)
+       GL_STUB(VertexAttribI2uiEXT, 817, VertexAttribI2uiEXT@12)
+       GL_STUB(VertexAttribI2uivEXT, 818, VertexAttribI2uivEXT@8)
+       GL_STUB(VertexAttribI3iEXT, 819, VertexAttribI3iEXT@16)
+       GL_STUB(VertexAttribI3ivEXT, 820, VertexAttribI3ivEXT@8)
+       GL_STUB(VertexAttribI3uiEXT, 821, VertexAttribI3uiEXT@16)
+       GL_STUB(VertexAttribI3uivEXT, 822, VertexAttribI3uivEXT@8)
+       GL_STUB(VertexAttribI4bvEXT, 823, VertexAttribI4bvEXT@8)
+       GL_STUB(VertexAttribI4iEXT, 824, VertexAttribI4iEXT@20)
+       GL_STUB(VertexAttribI4ivEXT, 825, VertexAttribI4ivEXT@8)
+       GL_STUB(VertexAttribI4svEXT, 826, VertexAttribI4svEXT@8)
+       GL_STUB(VertexAttribI4ubvEXT, 827, VertexAttribI4ubvEXT@8)
+       GL_STUB(VertexAttribI4uiEXT, 828, VertexAttribI4uiEXT@20)
+       GL_STUB(VertexAttribI4uivEXT, 829, VertexAttribI4uivEXT@8)
+       GL_STUB(VertexAttribI4usvEXT, 830, VertexAttribI4usvEXT@8)
+       GL_STUB(VertexAttribIPointerEXT, 831, VertexAttribIPointerEXT@20)
+       GL_STUB(FramebufferTextureLayerEXT, 832, FramebufferTextureLayerEXT@20)
+       GL_STUB(ColorMaskIndexedEXT, 833, ColorMaskIndexedEXT@20)
+       GL_STUB(DisableIndexedEXT, 834, DisableIndexedEXT@8)
+       GL_STUB(EnableIndexedEXT, 835, EnableIndexedEXT@8)
+       GL_STUB(GetBooleanIndexedvEXT, 836, GetBooleanIndexedvEXT@12)
+       GL_STUB(GetIntegerIndexedvEXT, 837, GetIntegerIndexedvEXT@12)
+       GL_STUB(IsEnabledIndexedEXT, 838, IsEnabledIndexedEXT@8)
+       GL_STUB(ClearColorIiEXT, 839, ClearColorIiEXT@16)
+       GL_STUB(ClearColorIuiEXT, 840, ClearColorIuiEXT@16)
+       GL_STUB(GetTexParameterIivEXT, 841, GetTexParameterIivEXT@12)
+       GL_STUB(GetTexParameterIuivEXT, 842, GetTexParameterIuivEXT@12)
+       GL_STUB(TexParameterIivEXT, 843, TexParameterIivEXT@12)
+       GL_STUB(TexParameterIuivEXT, 844, TexParameterIuivEXT@12)
+       GL_STUB(BeginConditionalRenderNV, 845, BeginConditionalRenderNV@8)
+       GL_STUB(EndConditionalRenderNV, 846, EndConditionalRenderNV@0)
+       GL_STUB(BeginTransformFeedbackEXT, 847, BeginTransformFeedbackEXT@4)
+       GL_STUB(BindBufferBaseEXT, 848, BindBufferBaseEXT@12)
+       GL_STUB(BindBufferOffsetEXT, 849, BindBufferOffsetEXT@16)
+       GL_STUB(BindBufferRangeEXT, 850, BindBufferRangeEXT@20)
+       GL_STUB(EndTransformFeedbackEXT, 851, EndTransformFeedbackEXT@0)
+       GL_STUB(GetTransformFeedbackVaryingEXT, 852, GetTransformFeedbackVaryingEXT@28)
+       GL_STUB(TransformFeedbackVaryingsEXT, 853, TransformFeedbackVaryingsEXT@16)
+       GL_STUB(ProvokingVertexEXT, 854, ProvokingVertexEXT@4)
+       GL_STUB(_dispatch_stub_855, 855, _dispatch_stub_855@12)
+       HIDDEN(GL_PREFIX(_dispatch_stub_855, _dispatch_stub_855@12))
+       GL_STUB(_dispatch_stub_856, 856, _dispatch_stub_856@12)
+       HIDDEN(GL_PREFIX(_dispatch_stub_856, _dispatch_stub_856@12))
+       GL_STUB(GetObjectParameterivAPPLE, 857, GetObjectParameterivAPPLE@16)
+       GL_STUB(ObjectPurgeableAPPLE, 858, ObjectPurgeableAPPLE@12)
+       GL_STUB(ObjectUnpurgeableAPPLE, 859, ObjectUnpurgeableAPPLE@12)
+       GL_STUB(ActiveProgramEXT, 860, ActiveProgramEXT@4)
+       GL_STUB(CreateShaderProgramEXT, 861, CreateShaderProgramEXT@8)
+       GL_STUB(UseShaderProgramEXT, 862, UseShaderProgramEXT@8)
+       GL_STUB(_dispatch_stub_863, 863, _dispatch_stub_863@16)
+       HIDDEN(GL_PREFIX(_dispatch_stub_863, _dispatch_stub_863@16))
+       GL_STUB(_dispatch_stub_864, 864, _dispatch_stub_864@16)
+       HIDDEN(GL_PREFIX(_dispatch_stub_864, _dispatch_stub_864@16))
+       GL_STUB(_dispatch_stub_865, 865, _dispatch_stub_865@16)
+       HIDDEN(GL_PREFIX(_dispatch_stub_865, _dispatch_stub_865@16))
+       GL_STUB(_dispatch_stub_866, 866, _dispatch_stub_866@12)
+       HIDDEN(GL_PREFIX(_dispatch_stub_866, _dispatch_stub_866@12))
+       GL_STUB(_dispatch_stub_867, 867, _dispatch_stub_867@12)
+       HIDDEN(GL_PREFIX(_dispatch_stub_867, _dispatch_stub_867@12))
+       GL_STUB(EGLImageTargetRenderbufferStorageOES, 868, EGLImageTargetRenderbufferStorageOES@8)
+       GL_STUB(EGLImageTargetTexture2DOES, 869, EGLImageTargetTexture2DOES@8)
        GL_STUB_ALIAS(ArrayElementEXT, 306, ArrayElementEXT@4, ArrayElement, ArrayElement@4)
        GL_STUB_ALIAS(BindTextureEXT, 307, BindTextureEXT@8, BindTexture, BindTexture@8)
        GL_STUB_ALIAS(DrawArraysEXT, 310, DrawArraysEXT@12, DrawArrays, DrawArrays@12)
@@ -1297,14 +1334,14 @@ GLNAME(gl_dispatch_functions_start):
        GL_STUB_ALIAS(IsRenderbuffer, 793, IsRenderbuffer@4, IsRenderbufferEXT, IsRenderbufferEXT@4)
        GL_STUB_ALIAS(RenderbufferStorage, 794, RenderbufferStorage@16, RenderbufferStorageEXT, RenderbufferStorageEXT@16)
        GL_STUB_ALIAS(BlitFramebuffer, 795, BlitFramebuffer@40, _dispatch_stub_795, _dispatch_stub_795@40)
-       GL_STUB_ALIAS(FramebufferTextureLayer, 798, FramebufferTextureLayer@20, FramebufferTextureLayerEXT, FramebufferTextureLayerEXT@20)
-       GL_STUB_ALIAS(BeginTransformFeedback, 813, BeginTransformFeedback@4, BeginTransformFeedbackEXT, BeginTransformFeedbackEXT@4)
-       GL_STUB_ALIAS(BindBufferBase, 814, BindBufferBase@12, BindBufferBaseEXT, BindBufferBaseEXT@12)
-       GL_STUB_ALIAS(BindBufferRange, 816, BindBufferRange@20, BindBufferRangeEXT, BindBufferRangeEXT@20)
-       GL_STUB_ALIAS(EndTransformFeedback, 817, EndTransformFeedback@0, EndTransformFeedbackEXT, EndTransformFeedbackEXT@0)
-       GL_STUB_ALIAS(GetTransformFeedbackVarying, 818, GetTransformFeedbackVarying@28, GetTransformFeedbackVaryingEXT, GetTransformFeedbackVaryingEXT@28)
-       GL_STUB_ALIAS(TransformFeedbackVaryings, 819, TransformFeedbackVaryings@16, TransformFeedbackVaryingsEXT, TransformFeedbackVaryingsEXT@16)
-       GL_STUB_ALIAS(ProvokingVertex, 820, ProvokingVertex@4, ProvokingVertexEXT, ProvokingVertexEXT@4)
+       GL_STUB_ALIAS(FramebufferTextureLayer, 832, FramebufferTextureLayer@20, FramebufferTextureLayerEXT, FramebufferTextureLayerEXT@20)
+       GL_STUB_ALIAS(BeginTransformFeedback, 847, BeginTransformFeedback@4, BeginTransformFeedbackEXT, BeginTransformFeedbackEXT@4)
+       GL_STUB_ALIAS(BindBufferBase, 848, BindBufferBase@12, BindBufferBaseEXT, BindBufferBaseEXT@12)
+       GL_STUB_ALIAS(BindBufferRange, 850, BindBufferRange@20, BindBufferRangeEXT, BindBufferRangeEXT@20)
+       GL_STUB_ALIAS(EndTransformFeedback, 851, EndTransformFeedback@0, EndTransformFeedbackEXT, EndTransformFeedbackEXT@0)
+       GL_STUB_ALIAS(GetTransformFeedbackVarying, 852, GetTransformFeedbackVarying@28, GetTransformFeedbackVaryingEXT, GetTransformFeedbackVaryingEXT@28)
+       GL_STUB_ALIAS(TransformFeedbackVaryings, 853, TransformFeedbackVaryings@16, TransformFeedbackVaryingsEXT, TransformFeedbackVaryingsEXT@16)
+       GL_STUB_ALIAS(ProvokingVertex, 854, ProvokingVertex@4, ProvokingVertexEXT, ProvokingVertexEXT@4)
 
                GLOBL   GLNAME(gl_dispatch_functions_end)
                HIDDEN(GLNAME(gl_dispatch_functions_end))