From: Thomas Hellstrom <thellstrom-at-vmware-dot-com>
Date: Mon, 15 Jun 2009 09:43:48 +0000 (+0200)
Subject: Merge branch 'mesa_7_5_branch'
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=f5888d9ca56ba68c01a4c9f111174650fac943aa;p=mesa.git

Merge branch 'mesa_7_5_branch'

Conflicts:

	progs/util/extfuncs.h
---

f5888d9ca56ba68c01a4c9f111174650fac943aa
diff --cc progs/util/extfuncs.h
index 238794d55a9,0469e2f2c4c..2bb57030a89
--- a/progs/util/extfuncs.h
+++ b/progs/util/extfuncs.h
@@@ -95,7 -95,49 +95,48 @@@ static PFNGLBUFFERSUBDATAARBPROC glBuff
  static PFNGLMAPBUFFERARBPROC glMapBufferARB_func = NULL;
  static PFNGLUNMAPBUFFERARBPROC glUnmapBufferARB_func = NULL;
  
+ /* GL_EXT_framebuffer_object */
+ static PFNGLISRENDERBUFFEREXTPROC glIsRenderbufferEXT_func = NULL;
+ static PFNGLBINDRENDERBUFFEREXTPROC glBindRenderbufferEXT_func = NULL;
+ static PFNGLDELETERENDERBUFFERSEXTPROC glDeleteRenderbuffersEXT_func = NULL;
+ static PFNGLGENRENDERBUFFERSEXTPROC glGenRenderbuffersEXT_func = NULL;
+ static PFNGLRENDERBUFFERSTORAGEEXTPROC glRenderbufferStorageEXT_func = NULL;
+ static PFNGLGETRENDERBUFFERPARAMETERIVEXTPROC glGetRenderbufferParameterivEXT_func = NULL;
+ static PFNGLISFRAMEBUFFEREXTPROC glIsFramebufferEXT_func = NULL;
+ static PFNGLBINDFRAMEBUFFEREXTPROC glBindFramebufferEXT_func = NULL;
+ static PFNGLDELETEFRAMEBUFFERSEXTPROC glDeleteFramebuffersEXT_func = NULL;
+ static PFNGLGENFRAMEBUFFERSEXTPROC glGenFramebuffersEXT_func = NULL;
+ static PFNGLCHECKFRAMEBUFFERSTATUSEXTPROC glCheckFramebufferStatusEXT_func = NULL;
+ static PFNGLFRAMEBUFFERTEXTURE1DEXTPROC glFramebufferTexture1DEXT_func = NULL;
+ static PFNGLFRAMEBUFFERTEXTURE2DEXTPROC glFramebufferTexture2DEXT_func = NULL;
+ static PFNGLFRAMEBUFFERTEXTURE3DEXTPROC glFramebufferTexture3DEXT_func = NULL;
+ static PFNGLFRAMEBUFFERRENDERBUFFEREXTPROC glFramebufferRenderbufferEXT_func = NULL;
+ static PFNGLGETFRAMEBUFFERATTACHMENTPARAMETERIVEXTPROC glGetFramebufferAttachmentParameterivEXT_func = NULL;
+ static PFNGLGENERATEMIPMAPEXTPROC glGenerateMipmapEXT_func = NULL;
+ 
+ /* GL_ARB_framebuffer_object */
+ static PFNGLISRENDERBUFFERPROC glIsRenderbuffer_func = NULL;
+ static PFNGLBINDRENDERBUFFERPROC glBindRenderbuffer_func = NULL;
+ static PFNGLDELETERENDERBUFFERSPROC glDeleteRenderbuffers_func = NULL;
+ static PFNGLGENRENDERBUFFERSPROC glGenRenderbuffers_func = NULL;
+ static PFNGLRENDERBUFFERSTORAGEPROC glRenderbufferStorage_func = NULL;
+ static PFNGLGETRENDERBUFFERPARAMETERIVPROC glGetRenderbufferParameteriv_func = NULL;
+ static PFNGLISFRAMEBUFFERPROC glIsFramebuffer_func = NULL;
+ static PFNGLBINDFRAMEBUFFERPROC glBindFramebuffer_func = NULL;
+ static PFNGLDELETEFRAMEBUFFERSPROC glDeleteFramebuffers_func = NULL;
+ static PFNGLGENFRAMEBUFFERSPROC glGenFramebuffers_func = NULL;
+ static PFNGLCHECKFRAMEBUFFERSTATUSPROC glCheckFramebufferStatus_func = NULL;
+ static PFNGLFRAMEBUFFERTEXTURE1DPROC glFramebufferTexture1D_func = NULL;
+ static PFNGLFRAMEBUFFERTEXTURE2DPROC glFramebufferTexture2D_func = NULL;
+ static PFNGLFRAMEBUFFERTEXTURE3DPROC glFramebufferTexture3D_func = NULL;
+ static PFNGLFRAMEBUFFERRENDERBUFFERPROC glFramebufferRenderbuffer_func = NULL;
+ static PFNGLGETFRAMEBUFFERATTACHMENTPARAMETERIVPROC glGetFramebufferAttachmentParameteriv_func = NULL;
+ static PFNGLGENERATEMIPMAPPROC glGenerateMipmap_func = NULL;
+ static PFNGLBLITFRAMEBUFFERPROC glBlitFramebuffer_func = NULL;
+ static PFNGLRENDERBUFFERSTORAGEMULTISAMPLEPROC glRenderbufferStorageMultisample_func = NULL;
+ static PFNGLFRAMEBUFFERTEXTURELAYERPROC glFramebufferTextureLayer_func = NULL;
+ 
  
 -
  static void
  GetExtensionFuncs(void)
  {