Skip to content

Commit 04afdbe

Browse files
committed
dear imgui: update to v1.92.3
1 parent 50f768e commit 04afdbe

File tree

10 files changed

+788
-451
lines changed

10 files changed

+788
-451
lines changed

include/imgui/imgui.h

Lines changed: 42 additions & 18 deletions
Large diffs are not rendered by default.

include/imgui/imgui_impl_opengl3_loader.h

Lines changed: 17 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -180,6 +180,7 @@ typedef khronos_uint8_t GLubyte;
180180
#define GL_RENDERER 0x1F01
181181
#define GL_VERSION 0x1F02
182182
#define GL_EXTENSIONS 0x1F03
183+
#define GL_NEAREST 0x2600
183184
#define GL_LINEAR 0x2601
184185
#define GL_TEXTURE_MAG_FILTER 0x2800
185186
#define GL_TEXTURE_MIN_FILTER 0x2801
@@ -400,9 +401,15 @@ GLAPI void APIENTRY glDrawElementsBaseVertex (GLenum mode, GLsizei count, GLenum
400401
#ifndef GL_VERSION_3_3
401402
#define GL_VERSION_3_3 1
402403
#define GL_SAMPLER_BINDING 0x8919
404+
typedef void (APIENTRYP PFNGLGENSAMPLERSPROC) (GLsizei count, GLuint *samplers);
405+
typedef void (APIENTRYP PFNGLDELETESAMPLERSPROC) (GLsizei count, const GLuint *samplers);
403406
typedef void (APIENTRYP PFNGLBINDSAMPLERPROC) (GLuint unit, GLuint sampler);
407+
typedef void (APIENTRYP PFNGLSAMPLERPARAMETERIPROC) (GLuint sampler, GLenum pname, GLint param);
404408
#ifdef GL_GLEXT_PROTOTYPES
409+
GLAPI void APIENTRY glGenSamplers (GLsizei count, GLuint *samplers);
410+
GLAPI void APIENTRY glDeleteSamplers (GLsizei count, const GLuint *samplers);
405411
GLAPI void APIENTRY glBindSampler (GLuint unit, GLuint sampler);
412+
GLAPI void APIENTRY glSamplerParameteri (GLuint sampler, GLenum pname, GLint param);
406413
#endif
407414
#endif /* GL_VERSION_3_3 */
408415
#ifndef GL_VERSION_4_1
@@ -483,7 +490,7 @@ GL3W_API GL3WglProc imgl3wGetProcAddress(const char *proc);
483490

484491
/* gl3w internal state */
485492
union ImGL3WProcs {
486-
GL3WglProc ptr[60];
493+
GL3WglProc ptr[63];
487494
struct {
488495
PFNGLACTIVETEXTUREPROC ActiveTexture;
489496
PFNGLATTACHSHADERPROC AttachShader;
@@ -503,6 +510,7 @@ union ImGL3WProcs {
503510
PFNGLCREATESHADERPROC CreateShader;
504511
PFNGLDELETEBUFFERSPROC DeleteBuffers;
505512
PFNGLDELETEPROGRAMPROC DeleteProgram;
513+
PFNGLDELETESAMPLERSPROC DeleteSamplers;
506514
PFNGLDELETESHADERPROC DeleteShader;
507515
PFNGLDELETETEXTURESPROC DeleteTextures;
508516
PFNGLDELETEVERTEXARRAYSPROC DeleteVertexArrays;
@@ -515,6 +523,7 @@ union ImGL3WProcs {
515523
PFNGLENABLEVERTEXATTRIBARRAYPROC EnableVertexAttribArray;
516524
PFNGLFLUSHPROC Flush;
517525
PFNGLGENBUFFERSPROC GenBuffers;
526+
PFNGLGENSAMPLERSPROC GenSamplers;
518527
PFNGLGENTEXTURESPROC GenTextures;
519528
PFNGLGENVERTEXARRAYSPROC GenVertexArrays;
520529
PFNGLGETATTRIBLOCATIONPROC GetAttribLocation;
@@ -535,6 +544,7 @@ union ImGL3WProcs {
535544
PFNGLPIXELSTOREIPROC PixelStorei;
536545
PFNGLPOLYGONMODEPROC PolygonMode;
537546
PFNGLREADPIXELSPROC ReadPixels;
547+
PFNGLSAMPLERPARAMETERIPROC SamplerParameteri;
538548
PFNGLSCISSORPROC Scissor;
539549
PFNGLSHADERSOURCEPROC ShaderSource;
540550
PFNGLTEXIMAGE2DPROC TexImage2D;
@@ -569,6 +579,7 @@ GL3W_API extern union ImGL3WProcs imgl3wProcs;
569579
#define glCreateShader imgl3wProcs.gl.CreateShader
570580
#define glDeleteBuffers imgl3wProcs.gl.DeleteBuffers
571581
#define glDeleteProgram imgl3wProcs.gl.DeleteProgram
582+
#define glDeleteSamplers imgl3wProcs.gl.DeleteSamplers
572583
#define glDeleteShader imgl3wProcs.gl.DeleteShader
573584
#define glDeleteTextures imgl3wProcs.gl.DeleteTextures
574585
#define glDeleteVertexArrays imgl3wProcs.gl.DeleteVertexArrays
@@ -581,6 +592,7 @@ GL3W_API extern union ImGL3WProcs imgl3wProcs;
581592
#define glEnableVertexAttribArray imgl3wProcs.gl.EnableVertexAttribArray
582593
#define glFlush imgl3wProcs.gl.Flush
583594
#define glGenBuffers imgl3wProcs.gl.GenBuffers
595+
#define glGenSamplers imgl3wProcs.gl.GenSamplers
584596
#define glGenTextures imgl3wProcs.gl.GenTextures
585597
#define glGenVertexArrays imgl3wProcs.gl.GenVertexArrays
586598
#define glGetAttribLocation imgl3wProcs.gl.GetAttribLocation
@@ -601,6 +613,7 @@ GL3W_API extern union ImGL3WProcs imgl3wProcs;
601613
#define glPixelStorei imgl3wProcs.gl.PixelStorei
602614
#define glPolygonMode imgl3wProcs.gl.PolygonMode
603615
#define glReadPixels imgl3wProcs.gl.ReadPixels
616+
#define glSamplerParameteri imgl3wProcs.gl.SamplerParameteri
604617
#define glScissor imgl3wProcs.gl.Scissor
605618
#define glShaderSource imgl3wProcs.gl.ShaderSource
606619
#define glTexImage2D imgl3wProcs.gl.TexImage2D
@@ -870,6 +883,7 @@ static const char *proc_names[] = {
870883
"glCreateShader",
871884
"glDeleteBuffers",
872885
"glDeleteProgram",
886+
"glDeleteSamplers",
873887
"glDeleteShader",
874888
"glDeleteTextures",
875889
"glDeleteVertexArrays",
@@ -882,6 +896,7 @@ static const char *proc_names[] = {
882896
"glEnableVertexAttribArray",
883897
"glFlush",
884898
"glGenBuffers",
899+
"glGenSamplers",
885900
"glGenTextures",
886901
"glGenVertexArrays",
887902
"glGetAttribLocation",
@@ -902,6 +917,7 @@ static const char *proc_names[] = {
902917
"glPixelStorei",
903918
"glPolygonMode",
904919
"glReadPixels",
920+
"glSamplerParameteri",
905921
"glScissor",
906922
"glShaderSource",
907923
"glTexImage2D",

0 commit comments

Comments
 (0)