Merge branch 'master' into pipe-video

Conflicts:
	src/gallium/include/pipe/p_format.h

1 files changed, 68 insertions, 52 deletions

diff --git a/src/mapi/glapi/glapioffsets.h b/src/mapi/glapi/glapioffsets.h
index 48d83431957..6f44b1e801c 100644
--- a/src/mapi/glapi/glapioffsets.h
+++ b/src/mapi/glapi/glapioffsets.h
@@ -808,58 +808,66 @@
 #define _gloffset_ProgramNamedParameter4dvNV 771
 #define _gloffset_ProgramNamedParameter4fNV 772
 #define _gloffset_ProgramNamedParameter4fvNV 773
-#define _gloffset_DepthBoundsEXT 774
-#define _gloffset_BlendEquationSeparateEXT 775
-#define _gloffset_BindFramebufferEXT 776
-#define _gloffset_BindRenderbufferEXT 777
-#define _gloffset_CheckFramebufferStatusEXT 778
-#define _gloffset_DeleteFramebuffersEXT 779
-#define _gloffset_DeleteRenderbuffersEXT 780
-#define _gloffset_FramebufferRenderbufferEXT 781
-#define _gloffset_FramebufferTexture1DEXT 782
-#define _gloffset_FramebufferTexture2DEXT 783
-#define _gloffset_FramebufferTexture3DEXT 784
-#define _gloffset_GenFramebuffersEXT 785
-#define _gloffset_GenRenderbuffersEXT 786
-#define _gloffset_GenerateMipmapEXT 787
-#define _gloffset_GetFramebufferAttachmentParameterivEXT 788
-#define _gloffset_GetRenderbufferParameterivEXT 789
-#define _gloffset_IsFramebufferEXT 790
-#define _gloffset_IsRenderbufferEXT 791
-#define _gloffset_RenderbufferStorageEXT 792
-#define _gloffset_BlitFramebufferEXT 793
-#define _gloffset_BufferParameteriAPPLE 794
-#define _gloffset_FlushMappedBufferRangeAPPLE 795
-#define _gloffset_FramebufferTextureLayerEXT 796
-#define _gloffset_ColorMaskIndexedEXT 797
-#define _gloffset_DisableIndexedEXT 798
-#define _gloffset_EnableIndexedEXT 799
-#define _gloffset_GetBooleanIndexedvEXT 800
-#define _gloffset_GetIntegerIndexedvEXT 801
-#define _gloffset_IsEnabledIndexedEXT 802
-#define _gloffset_BeginConditionalRenderNV 803
-#define _gloffset_EndConditionalRenderNV 804
-#define _gloffset_BeginTransformFeedbackEXT 805
-#define _gloffset_BindBufferBaseEXT 806
-#define _gloffset_BindBufferOffsetEXT 807
-#define _gloffset_BindBufferRangeEXT 808
-#define _gloffset_EndTransformFeedbackEXT 809
-#define _gloffset_GetTransformFeedbackVaryingEXT 810
-#define _gloffset_TransformFeedbackVaryingsEXT 811
-#define _gloffset_ProvokingVertexEXT 812
-#define _gloffset_GetTexParameterPointervAPPLE 813
-#define _gloffset_TextureRangeAPPLE 814
-#define _gloffset_GetObjectParameterivAPPLE 815
-#define _gloffset_ObjectPurgeableAPPLE 816
-#define _gloffset_ObjectUnpurgeableAPPLE 817
-#define _gloffset_StencilFuncSeparateATI 818
-#define _gloffset_ProgramEnvParameters4fvEXT 819
-#define _gloffset_ProgramLocalParameters4fvEXT 820
-#define _gloffset_GetQueryObjecti64vEXT 821
-#define _gloffset_GetQueryObjectui64vEXT 822
-#define _gloffset_EGLImageTargetRenderbufferStorageOES 823
-#define _gloffset_EGLImageTargetTexture2DOES 824
-#define _gloffset_FIRST_DYNAMIC 825
+#define _gloffset_PrimitiveRestartIndexNV 774
+#define _gloffset_PrimitiveRestartNV 775
+#define _gloffset_DepthBoundsEXT 776
+#define _gloffset_BlendEquationSeparateEXT 777
+#define _gloffset_BindFramebufferEXT 778
+#define _gloffset_BindRenderbufferEXT 779
+#define _gloffset_CheckFramebufferStatusEXT 780
+#define _gloffset_DeleteFramebuffersEXT 781
+#define _gloffset_DeleteRenderbuffersEXT 782
+#define _gloffset_FramebufferRenderbufferEXT 783
+#define _gloffset_FramebufferTexture1DEXT 784
+#define _gloffset_FramebufferTexture2DEXT 785
+#define _gloffset_FramebufferTexture3DEXT 786
+#define _gloffset_GenFramebuffersEXT 787
+#define _gloffset_GenRenderbuffersEXT 788
+#define _gloffset_GenerateMipmapEXT 789
+#define _gloffset_GetFramebufferAttachmentParameterivEXT 790
+#define _gloffset_GetRenderbufferParameterivEXT 791
+#define _gloffset_IsFramebufferEXT 792
+#define _gloffset_IsRenderbufferEXT 793
+#define _gloffset_RenderbufferStorageEXT 794
+#define _gloffset_BlitFramebufferEXT 795
+#define _gloffset_BufferParameteriAPPLE 796
+#define _gloffset_FlushMappedBufferRangeAPPLE 797
+#define _gloffset_FramebufferTextureLayerEXT 798
+#define _gloffset_ColorMaskIndexedEXT 799
+#define _gloffset_DisableIndexedEXT 800
+#define _gloffset_EnableIndexedEXT 801
+#define _gloffset_GetBooleanIndexedvEXT 802
+#define _gloffset_GetIntegerIndexedvEXT 803
+#define _gloffset_IsEnabledIndexedEXT 804
+#define _gloffset_ClearColorIiEXT 805
+#define _gloffset_ClearColorIuiEXT 806
+#define _gloffset_GetTexParameterIivEXT 807
+#define _gloffset_GetTexParameterIuivEXT 808
+#define _gloffset_TexParameterIivEXT 809
+#define _gloffset_TexParameterIuivEXT 810
+#define _gloffset_BeginConditionalRenderNV 811
+#define _gloffset_EndConditionalRenderNV 812
+#define _gloffset_BeginTransformFeedbackEXT 813
+#define _gloffset_BindBufferBaseEXT 814
+#define _gloffset_BindBufferOffsetEXT 815
+#define _gloffset_BindBufferRangeEXT 816
+#define _gloffset_EndTransformFeedbackEXT 817
+#define _gloffset_GetTransformFeedbackVaryingEXT 818
+#define _gloffset_TransformFeedbackVaryingsEXT 819
+#define _gloffset_ProvokingVertexEXT 820
+#define _gloffset_GetTexParameterPointervAPPLE 821
+#define _gloffset_TextureRangeAPPLE 822
+#define _gloffset_GetObjectParameterivAPPLE 823
+#define _gloffset_ObjectPurgeableAPPLE 824
+#define _gloffset_ObjectUnpurgeableAPPLE 825
+#define _gloffset_StencilFuncSeparateATI 826
+#define _gloffset_ProgramEnvParameters4fvEXT 827
+#define _gloffset_ProgramLocalParameters4fvEXT 828
+#define _gloffset_GetQueryObjecti64vEXT 829
+#define _gloffset_GetQueryObjectui64vEXT 830
+#define _gloffset_EGLImageTargetRenderbufferStorageOES 831
+#define _gloffset_EGLImageTargetTexture2DOES 832
+#define _gloffset_FIRST_DYNAMIC 833
 
 #else
 
@@ -1229,6 +1237,8 @@
 #define _gloffset_ProgramNamedParameter4dvNV driDispatchRemapTable[ProgramNamedParameter4dvNV_remap_index]
 #define _gloffset_ProgramNamedParameter4fNV driDispatchRemapTable[ProgramNamedParameter4fNV_remap_index]
 #define _gloffset_ProgramNamedParameter4fvNV driDispatchRemapTable[ProgramNamedParameter4fvNV_remap_index]
+#define _gloffset_PrimitiveRestartIndexNV driDispatchRemapTable[PrimitiveRestartIndexNV_remap_index]
+#define _gloffset_PrimitiveRestartNV driDispatchRemapTable[PrimitiveRestartNV_remap_index]
 #define _gloffset_DepthBoundsEXT driDispatchRemapTable[DepthBoundsEXT_remap_index]
 #define _gloffset_BlendEquationSeparateEXT driDispatchRemapTable[BlendEquationSeparateEXT_remap_index]
 #define _gloffset_BindFramebufferEXT driDispatchRemapTable[BindFramebufferEXT_remap_index]
@@ -1258,6 +1268,12 @@
 #define _gloffset_GetBooleanIndexedvEXT driDispatchRemapTable[GetBooleanIndexedvEXT_remap_index]
 #define _gloffset_GetIntegerIndexedvEXT driDispatchRemapTable[GetIntegerIndexedvEXT_remap_index]
 #define _gloffset_IsEnabledIndexedEXT driDispatchRemapTable[IsEnabledIndexedEXT_remap_index]
+#define _gloffset_ClearColorIiEXT driDispatchRemapTable[ClearColorIiEXT_remap_index]
+#define _gloffset_ClearColorIuiEXT driDispatchRemapTable[ClearColorIuiEXT_remap_index]
+#define _gloffset_GetTexParameterIivEXT driDispatchRemapTable[GetTexParameterIivEXT_remap_index]
+#define _gloffset_GetTexParameterIuivEXT driDispatchRemapTable[GetTexParameterIuivEXT_remap_index]
+#define _gloffset_TexParameterIivEXT driDispatchRemapTable[TexParameterIivEXT_remap_index]
+#define _gloffset_TexParameterIuivEXT driDispatchRemapTable[TexParameterIuivEXT_remap_index]
 #define _gloffset_BeginConditionalRenderNV driDispatchRemapTable[BeginConditionalRenderNV_remap_index]
 #define _gloffset_EndConditionalRenderNV driDispatchRemapTable[EndConditionalRenderNV_remap_index]
 #define _gloffset_BeginTransformFeedbackEXT driDispatchRemapTable[BeginTransformFeedbackEXT_remap_index]