Mercurial > mxe-octave

annotate src/freeglut-1-fixes.patch @ 6191:dba78afaaad1

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
glut: Update to v3.2.1 * src/freeglut.mk: update version, checksum, build with cmake * src/freeglut-1-fixes.patch: update patch
author John Donoghue <john.donoghue@ieee.org>
date Sat, 30 Apr 2022 08:03:45 -0400
parents 99516e73b368
children
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
6191
dba78afaaad1 glut: Update to v3.2.1
John Donoghue <john.donoghue@ieee.org>
parents: 2353
diff changeset
1 diff --git a/freeglut/freeglut/src/fg_gl2.c b/freeglut/freeglut/src/fg_gl2.c
dba78afaaad1 glut: Update to v3.2.1
John Donoghue <john.donoghue@ieee.org>
parents: 2353
diff changeset
2 index 38b0acbb..f79c432a 100644
dba78afaaad1 glut: Update to v3.2.1
John Donoghue <john.donoghue@ieee.org>
parents: 2353
diff changeset
3 --- a/src/fg_gl2.c
dba78afaaad1 glut: Update to v3.2.1
John Donoghue <john.donoghue@ieee.org>
parents: 2353
diff changeset
4 +++ b/src/fg_gl2.c
dba78afaaad1 glut: Update to v3.2.1
John Donoghue <john.donoghue@ieee.org>
parents: 2353
diff changeset
5 @@ -27,6 +27,18 @@
dba78afaaad1 glut: Update to v3.2.1
John Donoghue <john.donoghue@ieee.org>
parents: 2353
diff changeset
6 #include "fg_internal.h"
dba78afaaad1 glut: Update to v3.2.1
John Donoghue <john.donoghue@ieee.org>
parents: 2353
diff changeset
7 #include "fg_gl2.h"
2040
8b909011187a package freeglut: add pkg-config support
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
8
6191
dba78afaaad1 glut: Update to v3.2.1
John Donoghue <john.donoghue@ieee.org>
parents: 2353
diff changeset
9 +#ifdef GL_ES_VERSION_2_0
dba78afaaad1 glut: Update to v3.2.1
John Donoghue <john.donoghue@ieee.org>
parents: 2353
diff changeset
10 +/* Use existing functions on GLES 2.0 */
dba78afaaad1 glut: Update to v3.2.1
John Donoghue <john.donoghue@ieee.org>
parents: 2353
diff changeset
11 +#else
dba78afaaad1 glut: Update to v3.2.1
John Donoghue <john.donoghue@ieee.org>
parents: 2353
diff changeset
12 +FGH_PFNGLGENBUFFERSPROC fghGenBuffers;
dba78afaaad1 glut: Update to v3.2.1
John Donoghue <john.donoghue@ieee.org>
parents: 2353
diff changeset
13 +FGH_PFNGLDELETEBUFFERSPROC fghDeleteBuffers;
dba78afaaad1 glut: Update to v3.2.1
John Donoghue <john.donoghue@ieee.org>
parents: 2353
diff changeset
14 +FGH_PFNGLBINDBUFFERPROC fghBindBuffer;
dba78afaaad1 glut: Update to v3.2.1
John Donoghue <john.donoghue@ieee.org>
parents: 2353
diff changeset
15 +FGH_PFNGLBUFFERDATAPROC fghBufferData;
dba78afaaad1 glut: Update to v3.2.1
John Donoghue <john.donoghue@ieee.org>
parents: 2353
diff changeset
16 +FGH_PFNGLENABLEVERTEXATTRIBARRAYPROC fghEnableVertexAttribArray;
dba78afaaad1 glut: Update to v3.2.1
John Donoghue <john.donoghue@ieee.org>
parents: 2353
diff changeset
17 +FGH_PFNGLDISABLEVERTEXATTRIBARRAYPROC fghDisableVertexAttribArray;
dba78afaaad1 glut: Update to v3.2.1
John Donoghue <john.donoghue@ieee.org>
parents: 2353
diff changeset
18 +FGH_PFNGLVERTEXATTRIBPOINTERPROC fghVertexAttribPointer;
dba78afaaad1 glut: Update to v3.2.1
John Donoghue <john.donoghue@ieee.org>
parents: 2353
diff changeset
19 +#endif
2040
8b909011187a package freeglut: add pkg-config support
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
20 +
6191
dba78afaaad1 glut: Update to v3.2.1
John Donoghue <john.donoghue@ieee.org>
parents: 2353
diff changeset
21 void FGAPIENTRY glutSetVertexAttribCoord3(GLint attrib) {
dba78afaaad1 glut: Update to v3.2.1
John Donoghue <john.donoghue@ieee.org>
parents: 2353
diff changeset
22 if (fgStructure.CurrentWindow != NULL)
dba78afaaad1 glut: Update to v3.2.1
John Donoghue <john.donoghue@ieee.org>
parents: 2353
diff changeset
23 fgStructure.CurrentWindow->Window.attribute_v_coord = attrib;
dba78afaaad1 glut: Update to v3.2.1
John Donoghue <john.donoghue@ieee.org>
parents: 2353
diff changeset
24 diff --git a/freeglut/freeglut/src/fg_gl2.h b/freeglut/freeglut/src/fg_gl2.h
dba78afaaad1 glut: Update to v3.2.1
John Donoghue <john.donoghue@ieee.org>
parents: 2353
diff changeset
25 index ab8ba5c7..fb3d4676 100644
dba78afaaad1 glut: Update to v3.2.1
John Donoghue <john.donoghue@ieee.org>
parents: 2353
diff changeset
26 --- a/src/fg_gl2.h
dba78afaaad1 glut: Update to v3.2.1
John Donoghue <john.donoghue@ieee.org>
parents: 2353
diff changeset
27 +++ b/src/fg_gl2.h
dba78afaaad1 glut: Update to v3.2.1
John Donoghue <john.donoghue@ieee.org>
parents: 2353
diff changeset
28 @@ -67,13 +67,13 @@ typedef void (APIENTRY *FGH_PFNGLENABLEVERTEXATTRIBARRAYPROC) (GLuint index);
dba78afaaad1 glut: Update to v3.2.1
John Donoghue <john.donoghue@ieee.org>
parents: 2353
diff changeset
29 typedef void (APIENTRY *FGH_PFNGLDISABLEVERTEXATTRIBARRAYPROC) (GLuint);
dba78afaaad1 glut: Update to v3.2.1
John Donoghue <john.donoghue@ieee.org>
parents: 2353
diff changeset
30 typedef void (APIENTRY *FGH_PFNGLVERTEXATTRIBPOINTERPROC) (GLuint index, GLint size, GLenum type, GLboolean normalized, GLsizei stride, const GLvoid *pointer);
dba78afaaad1 glut: Update to v3.2.1
John Donoghue <john.donoghue@ieee.org>
parents: 2353
diff changeset
31
dba78afaaad1 glut: Update to v3.2.1
John Donoghue <john.donoghue@ieee.org>
parents: 2353
diff changeset
32 -FGH_PFNGLGENBUFFERSPROC fghGenBuffers;
dba78afaaad1 glut: Update to v3.2.1
John Donoghue <john.donoghue@ieee.org>
parents: 2353
diff changeset
33 -FGH_PFNGLDELETEBUFFERSPROC fghDeleteBuffers;
dba78afaaad1 glut: Update to v3.2.1
John Donoghue <john.donoghue@ieee.org>
parents: 2353
diff changeset
34 -FGH_PFNGLBINDBUFFERPROC fghBindBuffer;
dba78afaaad1 glut: Update to v3.2.1
John Donoghue <john.donoghue@ieee.org>
parents: 2353
diff changeset
35 -FGH_PFNGLBUFFERDATAPROC fghBufferData;
dba78afaaad1 glut: Update to v3.2.1
John Donoghue <john.donoghue@ieee.org>
parents: 2353
diff changeset
36 -FGH_PFNGLENABLEVERTEXATTRIBARRAYPROC fghEnableVertexAttribArray;
dba78afaaad1 glut: Update to v3.2.1
John Donoghue <john.donoghue@ieee.org>
parents: 2353
diff changeset
37 -FGH_PFNGLDISABLEVERTEXATTRIBARRAYPROC fghDisableVertexAttribArray;
dba78afaaad1 glut: Update to v3.2.1
John Donoghue <john.donoghue@ieee.org>
parents: 2353
diff changeset
38 -FGH_PFNGLVERTEXATTRIBPOINTERPROC fghVertexAttribPointer;
dba78afaaad1 glut: Update to v3.2.1
John Donoghue <john.donoghue@ieee.org>
parents: 2353
diff changeset
39 +extern FGH_PFNGLGENBUFFERSPROC fghGenBuffers;
dba78afaaad1 glut: Update to v3.2.1
John Donoghue <john.donoghue@ieee.org>
parents: 2353
diff changeset
40 +extern FGH_PFNGLDELETEBUFFERSPROC fghDeleteBuffers;
dba78afaaad1 glut: Update to v3.2.1
John Donoghue <john.donoghue@ieee.org>
parents: 2353
diff changeset
41 +extern FGH_PFNGLBINDBUFFERPROC fghBindBuffer;
dba78afaaad1 glut: Update to v3.2.1
John Donoghue <john.donoghue@ieee.org>
parents: 2353
diff changeset
42 +extern FGH_PFNGLBUFFERDATAPROC fghBufferData;
dba78afaaad1 glut: Update to v3.2.1
John Donoghue <john.donoghue@ieee.org>
parents: 2353
diff changeset
43 +extern FGH_PFNGLENABLEVERTEXATTRIBARRAYPROC fghEnableVertexAttribArray;
dba78afaaad1 glut: Update to v3.2.1
John Donoghue <john.donoghue@ieee.org>
parents: 2353
diff changeset
44 +extern FGH_PFNGLDISABLEVERTEXATTRIBARRAYPROC fghDisableVertexAttribArray;
dba78afaaad1 glut: Update to v3.2.1
John Donoghue <john.donoghue@ieee.org>
parents: 2353
diff changeset
45 +extern FGH_PFNGLVERTEXATTRIBPOINTERPROC fghVertexAttribPointer;
dba78afaaad1 glut: Update to v3.2.1
John Donoghue <john.donoghue@ieee.org>
parents: 2353
diff changeset
46
dba78afaaad1 glut: Update to v3.2.1
John Donoghue <john.donoghue@ieee.org>
parents: 2353
diff changeset
47 # endif
dba78afaaad1 glut: Update to v3.2.1
John Donoghue <john.donoghue@ieee.org>
parents: 2353
diff changeset
48