Merge branch 'master' into opengl-es-v2

Conflicts:
	src/mesa/main/dd.h

diff --cc Makefile
Simple merge

diff --cc configure.ac
Simple merge

diff --cc src/gallium/state_trackers/egl/egl_tracker.c
Simple merge

diff --cc src/gallium/winsys/xlib/xlib.c
Simple merge

diff --cc src/mesa/drivers/x11/glxapi.c
Simple merge

diff --cc src/mesa/glapi/glapi.c
index ad72fe48bece65036cf4226a006264ad0c8f8620,84e5a8270a0d240325bd047a3f6fe8502bb850fc..adb47f9fecb0047a97b05eeaf56fbebfe97f0596
--- 1/src/mesa/glapi/glapi.c
--- 2/src/mesa/glapi/glapi.c
+++ b/src/mesa/glapi/glapi.c
@@@ -69,11 -69,10 +69,10 @@@
  #include <assert.h>
  #endif
  
 -#include "glapi.h"
 -#include "glapioffsets.h"
 -#include "glapitable.h"
 +#include "glapi/glapi.h"
 +#include "glapi/glapioffsets.h"
 +#include "glapi/glapitable.h"
  
- 
  /***** BEGIN NO-OP DISPATCH *****/
  
  static GLboolean WarnFlag = GL_FALSE;
@@@ -135,17 -143,12 +143,12 @@@ NoOpGeneric(void
  #define DISPATCH_TABLE_NAME __glapi_noop_table
  #define UNUSED_TABLE_NAME __unused_noop_functions
  
- #define TABLE_ENTRY(name) (_glapi_proc) NoOp##name
- 
  static GLint NoOpUnused(void)
  {
-    if (warn()) {
-       warning_func(NULL, "GL User Error: calling extension function without a current context\n");
-    }
-    return 0;
+    return warn("extension function");
  }
  
 -#include "glapitemp.h"
 +#include "glapi/glapitemp.h"
  
  /***** END NO-OP DISPATCH *****/
  

diff --cc src/mesa/glapi/glapi_getproc.c
Simple merge

diff --cc src/mesa/glapi/glapitemp.h
index 0138abddb806ffd7575c45a918ce146061e401e1,96b2ac726825b7f63116a9b03a557b9db38e2fa9..6767a07673d448044c7c7e6adeb61b3b69d3a942
--- 1/src/mesa/glapi/glapitemp.h
--- 2/src/mesa/glapi/glapitemp.h
+++ b/src/mesa/glapi/glapitemp.h
@@@ -6812,12 -6890,11 +6865,13 @@@ static _glapi_proc UNUSED_TABLE_NAME[] 
     TABLE_ENTRY(GetAttribLocation),
     TABLE_ENTRY(DrawBuffers),
     TABLE_ENTRY(DrawBuffersATI),
+    TABLE_ENTRY(RenderbufferStorageMultisampleEXT),
     TABLE_ENTRY(PointParameterf),
     TABLE_ENTRY(PointParameterfARB),
 +   TABLE_ENTRY(_dispatch_stub_592),
     TABLE_ENTRY(PointParameterfv),
     TABLE_ENTRY(PointParameterfvARB),
 +   TABLE_ENTRY(_dispatch_stub_593),
     TABLE_ENTRY(SecondaryColor3b),
     TABLE_ENTRY(SecondaryColor3bv),
     TABLE_ENTRY(SecondaryColor3d),

diff --cc src/mesa/glapi/glthread.c
Simple merge

diff --cc src/mesa/main/dd.h
index 0488a693b2b06054d414c8488c16ee5ec3407b84,e99e87d9059ce6251b88e4335b376cc4aed43021..6705c901dd592cd2b72cc91a028d3f8316783b37
--- 1/src/mesa/main/dd.h
--- 2/src/mesa/main/dd.h
+++ b/src/mesa/main/dd.h
@@@ -1047,15 -1017,10 +1017,20 @@@ struct dd_function_table 
     /*@}*/
  #endif
  
+    /** GL_NV_conditional_render */
+    void (*BeginConditionalRender)(GLcontext *ctx, struct gl_query_object *q,
+                                   GLenum mode);
+    void (*EndConditionalRender)(GLcontext *ctx, struct gl_query_object *q);
++
 +#if FEATURE_OES_draw_texture
 +   /**
 +    * \name GL_OES_draw_texture interface
 +    */
 +   /*@{*/
 +   void (*DrawTex)(GLcontext *ctx, GLfloat x, GLfloat y, GLfloat z,
 +                   GLfloat width, GLfloat height);
 +   /*@}*/
 +#endif
  };
  
  

diff --cc src/mesa/main/dispatch.c
Simple merge

diff --cc src/mesa/main/enums.c
Simple merge

diff --cc src/mesa/main/extensions.c
Simple merge

diff --cc src/mesa/main/getstring.c
Simple merge

diff --cc src/mesa/main/mtypes.h
index e91c7e5ac16d18bff4d1a3e1a8f3e4592552e422,5227565f8769f495c0f5a784d7f6e05ce8686e37..7eff5cadd0dc133427a615b456c57b2b77ff33d8
--- 1/src/mesa/main/mtypes.h
--- 2/src/mesa/main/mtypes.h
+++ b/src/mesa/main/mtypes.h
@@@ -2485,11 -2519,10 +2519,13 @@@ struct gl_extension
     GLboolean SGIS_texture_lod;
     GLboolean TDFX_texture_compression_FXT1;
     GLboolean S3_s3tc;
 +#if FEATURE_OES_draw_texture
 +   GLboolean OES_draw_texture;
 +#endif /* FEATURE_OES_draw_texture */
     /** The extension string */
     const GLubyte *String;
+    /** Number of supported extensions */
+    GLuint Count;
  };
  
  

diff --cc src/mesa/main/texgen.c
index 8d114108f8c49493eacc99afd45d9fbec824cf38,be4e03bc56c328d98d3027b24d0cd277ffecfcf7..2ae839b2a63071a69c5b5eb57dcc571764e8b77c
--- 1/src/mesa/main/texgen.c
--- 2/src/mesa/main/texgen.c
+++ b/src/mesa/main/texgen.c
@@@ -208,10 -210,13 +210,13 @@@ _mesa_TexGendv(GLenum coord, GLenum pna
  }
  
  
 -static void GLAPIENTRY
 +void GLAPIENTRY
  _mesa_TexGenf( GLenum coord, GLenum pname, GLfloat param )
  {
-    _mesa_TexGenfv(coord, pname, &param);
+    GLfloat p[4];
+    p[0] = param;
+    p[1] = p[2] = p[3] = 0.0F;
+    _mesa_TexGenfv(coord, pname, p);
  }
  
  

diff --cc src/mesa/main/texgetimage.c
Simple merge

diff --cc src/mesa/state_tracker/st_context.c
index e82598c8e7e0b2b4c62873d03dc5bab911859c7f,e4f18c842ca79e8472638ac48e2f72ef24984c76..145bd62b83e737de71f8feda5d9cf1781be39aaf
--- 1/src/mesa/state_tracker/st_context.c
--- 2/src/mesa/state_tracker/st_context.c
+++ b/src/mesa/state_tracker/st_context.c
@@@ -330,13 -330,7 +330,12 @@@ void st_init_driver_functions(struct dd
     st_init_drawpixels_functions(functions);
     st_init_rasterpos_functions(functions);
  #endif
 +
 +#if FEATURE_OES_draw_texture
 +   st_init_drawtex_functions(functions);
 +#endif
 +
     st_init_fbo_functions(functions);
-    st_init_get_functions(functions);
  #if FEATURE_feedback
     st_init_feedback_functions(functions);
  #endif

diff --cc src/mesa/state_tracker/st_extensions.c
Simple merge

diff --cc src/mesa/x86-64/glapi_x86-64.S
Simple merge

diff --cc src/mesa/x86/glapi_x86.S
Simple merge