diff mbox

[01/18] Remove glBlendColor and glBlendEquations decls from glext.h

Message ID 1386984330-26074-2-git-send-email-keithp@keithp.com
State New, archived
Headers show

Commit Message

Keith Packard Dec. 14, 2013, 1:25 a.m. UTC
These are duplicates from gl.h; I'm not sure which file they belong in, but
you don't get to have them in both places.

Signed-off-by: Keith Packard <keithp@keithp.com>
---
 include/GL/glext.h | 2 --
 1 file changed, 2 deletions(-)

Comments

Kenneth Graunke Dec. 14, 2013, 2:28 a.m. UTC | #1
On 12/13/2013 05:25 PM, Keith Packard wrote:
> These are duplicates from gl.h; I'm not sure which file they belong in, but
> you don't get to have them in both places.
> 
> Signed-off-by: Keith Packard <keithp@keithp.com>
> ---
>  include/GL/glext.h | 2 --
>  1 file changed, 2 deletions(-)
> 
> diff --git a/include/GL/glext.h b/include/GL/glext.h
> index 7d6033e..b432d2e 100644
> --- a/include/GL/glext.h
> +++ b/include/GL/glext.h
> @@ -457,8 +457,6 @@ GLAPI void APIENTRY glWindowPos3i (GLint x, GLint y, GLint z);
>  GLAPI void APIENTRY glWindowPos3iv (const GLint *v);
>  GLAPI void APIENTRY glWindowPos3s (GLshort x, GLshort y, GLshort z);
>  GLAPI void APIENTRY glWindowPos3sv (const GLshort *v);
> -GLAPI void APIENTRY glBlendColor (GLfloat red, GLfloat green, GLfloat blue, GLfloat alpha);
> -GLAPI void APIENTRY glBlendEquation (GLenum mode);
>  #endif
>  #endif /* GL_VERSION_1_4 */

NAK.  These headers come directly from Khronos; we need to somehow get
this fixed upstream and take their version.

--Ken
Keith Packard Dec. 14, 2013, 6:56 a.m. UTC | #2
Kenneth Graunke <kenneth@whitecape.org> writes:

> NAK.  These headers come directly from Khronos; we need to somehow get
> this fixed upstream and take their version.

Until they're fixed upstream, we should fix them when incorporating them
into the repository. Having broken headers in our code just because
they're broken upstream doesn't make any sense.

I can envision a fairly simple script that would fetch the current
version from khronos, apply a sequence of patches and then commit the
result to the mesa repository.
Ian Romanick Dec. 20, 2013, 6:24 p.m. UTC | #3
On 12/13/2013 05:25 PM, Keith Packard wrote:
> These are duplicates from gl.h; I'm not sure which file they belong in, but
> you don't get to have them in both places.

If you're doing something that involves defining GL_GLEXT_PROTOTYPES,
you're doing it wrong.

Also, unless you're sending kernel or libdrm patches, there's no reason
to CC dri-devel. :)

> Signed-off-by: Keith Packard <keithp@keithp.com>
> ---
>  include/GL/glext.h | 2 --
>  1 file changed, 2 deletions(-)
> 
> diff --git a/include/GL/glext.h b/include/GL/glext.h
> index 7d6033e..b432d2e 100644
> --- a/include/GL/glext.h
> +++ b/include/GL/glext.h
> @@ -457,8 +457,6 @@ GLAPI void APIENTRY glWindowPos3i (GLint x, GLint y, GLint z);
>  GLAPI void APIENTRY glWindowPos3iv (const GLint *v);
>  GLAPI void APIENTRY glWindowPos3s (GLshort x, GLshort y, GLshort z);
>  GLAPI void APIENTRY glWindowPos3sv (const GLshort *v);
> -GLAPI void APIENTRY glBlendColor (GLfloat red, GLfloat green, GLfloat blue, GLfloat alpha);
> -GLAPI void APIENTRY glBlendEquation (GLenum mode);
>  #endif
>  #endif /* GL_VERSION_1_4 */
>  
>
diff mbox

Patch

diff --git a/include/GL/glext.h b/include/GL/glext.h
index 7d6033e..b432d2e 100644
--- a/include/GL/glext.h
+++ b/include/GL/glext.h
@@ -457,8 +457,6 @@  GLAPI void APIENTRY glWindowPos3i (GLint x, GLint y, GLint z);
 GLAPI void APIENTRY glWindowPos3iv (const GLint *v);
 GLAPI void APIENTRY glWindowPos3s (GLshort x, GLshort y, GLshort z);
 GLAPI void APIENTRY glWindowPos3sv (const GLshort *v);
-GLAPI void APIENTRY glBlendColor (GLfloat red, GLfloat green, GLfloat blue, GLfloat alpha);
-GLAPI void APIENTRY glBlendEquation (GLenum mode);
 #endif
 #endif /* GL_VERSION_1_4 */