From ae17c457a7c80c5ccc2984c86f6940c453f56899 Mon Sep 17 00:00:00 2001 From: Zachary Lund Date: Sat, 25 Jan 2014 23:58:43 -0600 Subject: [PATCH] Regenerated files --- libobs-opengl/GL/gl_obs.c | 19 ++++++------ libobs-opengl/GL/gl_obs.h | 62 +++++++++++++++++++------------------- libobs-opengl/GL/glx_obs.c | 1 + libobs-opengl/GL/wgl_obs.c | 1 + 4 files changed, 43 insertions(+), 40 deletions(-) diff --git a/libobs-opengl/GL/gl_obs.c b/libobs-opengl/GL/gl_obs.c index c47e9075a..67ae4c5bf 100644 --- a/libobs-opengl/GL/gl_obs.c +++ b/libobs-opengl/GL/gl_obs.c @@ -44,6 +44,7 @@ static void* SunGetProcAddress (const GLubyte* name) #ifdef _MSC_VER #pragma warning(disable: 4055) #pragma warning(disable: 4054) +#pragma warning(disable: 4996) #endif static int TestPointer(const PROC pTest) @@ -84,6 +85,9 @@ static PROC WinGetProcAddress(const char *name) #endif #endif +int ogl_ext_EXT_texture_compression_s3tc = ogl_LOAD_FAILED; +int ogl_ext_EXT_texture_sRGB = ogl_LOAD_FAILED; +int ogl_ext_EXT_texture_filter_anisotropic = ogl_LOAD_FAILED; int ogl_ext_ARB_framebuffer_object = ogl_LOAD_FAILED; int ogl_ext_ARB_seamless_cube_map = ogl_LOAD_FAILED; int ogl_ext_ARB_separate_shader_objects = ogl_LOAD_FAILED; @@ -91,9 +95,6 @@ int ogl_ext_ARB_debug_output = ogl_LOAD_FAILED; int ogl_ext_ARB_copy_image = ogl_LOAD_FAILED; int ogl_ext_NV_copy_image = ogl_LOAD_FAILED; int ogl_ext_EXT_texture_mirror_clamp = ogl_LOAD_FAILED; -int ogl_ext_EXT_texture_compression_s3tc = ogl_LOAD_FAILED; -int ogl_ext_EXT_texture_sRGB = ogl_LOAD_FAILED; -int ogl_ext_EXT_texture_filter_anisotropic = ogl_LOAD_FAILED; void (CODEGEN_FUNCPTR *_ptrc_glBindFramebuffer)(GLenum, GLuint) = NULL; void (CODEGEN_FUNCPTR *_ptrc_glBindRenderbuffer)(GLenum, GLuint) = NULL; @@ -2055,6 +2056,9 @@ typedef struct ogl_StrToExtMap_s } ogl_StrToExtMap; static ogl_StrToExtMap ExtensionMap[10] = { + {"GL_EXT_texture_compression_s3tc", &ogl_ext_EXT_texture_compression_s3tc, NULL}, + {"GL_EXT_texture_sRGB", &ogl_ext_EXT_texture_sRGB, NULL}, + {"GL_EXT_texture_filter_anisotropic", &ogl_ext_EXT_texture_filter_anisotropic, NULL}, {"GL_ARB_framebuffer_object", &ogl_ext_ARB_framebuffer_object, Load_ARB_framebuffer_object}, {"GL_ARB_seamless_cube_map", &ogl_ext_ARB_seamless_cube_map, NULL}, {"GL_ARB_separate_shader_objects", &ogl_ext_ARB_separate_shader_objects, Load_ARB_separate_shader_objects}, @@ -2062,9 +2066,6 @@ static ogl_StrToExtMap ExtensionMap[10] = { {"GL_ARB_copy_image", &ogl_ext_ARB_copy_image, Load_ARB_copy_image}, {"GL_NV_copy_image", &ogl_ext_NV_copy_image, Load_NV_copy_image}, {"GL_EXT_texture_mirror_clamp", &ogl_ext_EXT_texture_mirror_clamp, NULL}, - {"GL_EXT_texture_compression_s3tc", &ogl_ext_EXT_texture_compression_s3tc, NULL}, - {"GL_EXT_texture_sRGB", &ogl_ext_EXT_texture_sRGB, NULL}, - {"GL_EXT_texture_filter_anisotropic", &ogl_ext_EXT_texture_filter_anisotropic, NULL}, }; static int g_extensionMapSize = 10; @@ -2084,6 +2085,9 @@ static ogl_StrToExtMap *FindExtEntry(const char *extensionName) static void ClearExtensionVars() { + ogl_ext_EXT_texture_compression_s3tc = ogl_LOAD_FAILED; + ogl_ext_EXT_texture_sRGB = ogl_LOAD_FAILED; + ogl_ext_EXT_texture_filter_anisotropic = ogl_LOAD_FAILED; ogl_ext_ARB_framebuffer_object = ogl_LOAD_FAILED; ogl_ext_ARB_seamless_cube_map = ogl_LOAD_FAILED; ogl_ext_ARB_separate_shader_objects = ogl_LOAD_FAILED; @@ -2091,9 +2095,6 @@ static void ClearExtensionVars() ogl_ext_ARB_copy_image = ogl_LOAD_FAILED; ogl_ext_NV_copy_image = ogl_LOAD_FAILED; ogl_ext_EXT_texture_mirror_clamp = ogl_LOAD_FAILED; - ogl_ext_EXT_texture_compression_s3tc = ogl_LOAD_FAILED; - ogl_ext_EXT_texture_sRGB = ogl_LOAD_FAILED; - ogl_ext_EXT_texture_filter_anisotropic = ogl_LOAD_FAILED; } diff --git a/libobs-opengl/GL/gl_obs.h b/libobs-opengl/GL/gl_obs.h index 2502789bc..856aefd5b 100644 --- a/libobs-opengl/GL/gl_obs.h +++ b/libobs-opengl/GL/gl_obs.h @@ -153,6 +153,9 @@ typedef unsigned int GLhandleARB; extern "C" { #endif /*__cplusplus*/ +extern int ogl_ext_EXT_texture_compression_s3tc; +extern int ogl_ext_EXT_texture_sRGB; +extern int ogl_ext_EXT_texture_filter_anisotropic; extern int ogl_ext_ARB_framebuffer_object; extern int ogl_ext_ARB_seamless_cube_map; extern int ogl_ext_ARB_separate_shader_objects; @@ -160,9 +163,31 @@ extern int ogl_ext_ARB_debug_output; extern int ogl_ext_ARB_copy_image; extern int ogl_ext_NV_copy_image; extern int ogl_ext_EXT_texture_mirror_clamp; -extern int ogl_ext_EXT_texture_compression_s3tc; -extern int ogl_ext_EXT_texture_sRGB; -extern int ogl_ext_EXT_texture_filter_anisotropic; + +#define GL_COMPRESSED_RGBA_S3TC_DXT1_EXT 0x83F1 +#define GL_COMPRESSED_RGBA_S3TC_DXT3_EXT 0x83F2 +#define GL_COMPRESSED_RGBA_S3TC_DXT5_EXT 0x83F3 +#define GL_COMPRESSED_RGB_S3TC_DXT1_EXT 0x83F0 + +#define GL_COMPRESSED_SLUMINANCE_ALPHA_EXT 0x8C4B +#define GL_COMPRESSED_SLUMINANCE_EXT 0x8C4A +#define GL_COMPRESSED_SRGB_ALPHA_EXT 0x8C49 +#define GL_COMPRESSED_SRGB_ALPHA_S3TC_DXT1_EXT 0x8C4D +#define GL_COMPRESSED_SRGB_ALPHA_S3TC_DXT3_EXT 0x8C4E +#define GL_COMPRESSED_SRGB_ALPHA_S3TC_DXT5_EXT 0x8C4F +#define GL_COMPRESSED_SRGB_EXT 0x8C48 +#define GL_COMPRESSED_SRGB_S3TC_DXT1_EXT 0x8C4C +#define GL_SLUMINANCE8_ALPHA8_EXT 0x8C45 +#define GL_SLUMINANCE8_EXT 0x8C47 +#define GL_SLUMINANCE_ALPHA_EXT 0x8C44 +#define GL_SLUMINANCE_EXT 0x8C46 +#define GL_SRGB8_ALPHA8_EXT 0x8C43 +#define GL_SRGB8_EXT 0x8C41 +#define GL_SRGB_ALPHA_EXT 0x8C42 +#define GL_SRGB_EXT 0x8C40 + +#define GL_MAX_TEXTURE_MAX_ANISOTROPY_EXT 0x84FF +#define GL_TEXTURE_MAX_ANISOTROPY_EXT 0x84FE #define GL_COLOR_ATTACHMENT0 0x8CE0 #define GL_COLOR_ATTACHMENT1 0x8CE1 @@ -284,31 +309,6 @@ extern int ogl_ext_EXT_texture_filter_anisotropic; #define GL_MIRROR_CLAMP_TO_BORDER_EXT 0x8912 #define GL_MIRROR_CLAMP_TO_EDGE_EXT 0x8743 -#define GL_COMPRESSED_RGBA_S3TC_DXT1_EXT 0x83F1 -#define GL_COMPRESSED_RGBA_S3TC_DXT3_EXT 0x83F2 -#define GL_COMPRESSED_RGBA_S3TC_DXT5_EXT 0x83F3 -#define GL_COMPRESSED_RGB_S3TC_DXT1_EXT 0x83F0 - -#define GL_COMPRESSED_SLUMINANCE_ALPHA_EXT 0x8C4B -#define GL_COMPRESSED_SLUMINANCE_EXT 0x8C4A -#define GL_COMPRESSED_SRGB_ALPHA_EXT 0x8C49 -#define GL_COMPRESSED_SRGB_ALPHA_S3TC_DXT1_EXT 0x8C4D -#define GL_COMPRESSED_SRGB_ALPHA_S3TC_DXT3_EXT 0x8C4E -#define GL_COMPRESSED_SRGB_ALPHA_S3TC_DXT5_EXT 0x8C4F -#define GL_COMPRESSED_SRGB_EXT 0x8C48 -#define GL_COMPRESSED_SRGB_S3TC_DXT1_EXT 0x8C4C -#define GL_SLUMINANCE8_ALPHA8_EXT 0x8C45 -#define GL_SLUMINANCE8_EXT 0x8C47 -#define GL_SLUMINANCE_ALPHA_EXT 0x8C44 -#define GL_SLUMINANCE_EXT 0x8C46 -#define GL_SRGB8_ALPHA8_EXT 0x8C43 -#define GL_SRGB8_EXT 0x8C41 -#define GL_SRGB_ALPHA_EXT 0x8C42 -#define GL_SRGB_EXT 0x8C40 - -#define GL_MAX_TEXTURE_MAX_ANISOTROPY_EXT 0x84FF -#define GL_TEXTURE_MAX_ANISOTROPY_EXT 0x84FE - #define GL_ALPHA 0x1906 #define GL_ALWAYS 0x0207 #define GL_AND 0x1501 @@ -1607,6 +1607,9 @@ extern int ogl_ext_EXT_texture_filter_anisotropic; #define GL_TRANSFORM_FEEDBACK_BUFFER_INDEX 0x934B #define GL_TRANSFORM_FEEDBACK_BUFFER_STRIDE 0x934C + + + #ifndef GL_ARB_framebuffer_object #define GL_ARB_framebuffer_object 1 extern void (CODEGEN_FUNCPTR *_ptrc_glBindFramebuffer)(GLenum, GLuint); @@ -1801,9 +1804,6 @@ extern void (CODEGEN_FUNCPTR *_ptrc_glCopyImageSubDataNV)(GLuint, GLenum, GLint, #endif /*GL_NV_copy_image*/ - - - extern void (CODEGEN_FUNCPTR *_ptrc_glBlendFunc)(GLenum, GLenum); #define glBlendFunc _ptrc_glBlendFunc extern void (CODEGEN_FUNCPTR *_ptrc_glClear)(GLbitfield); diff --git a/libobs-opengl/GL/glx_obs.c b/libobs-opengl/GL/glx_obs.c index 0baf72f27..fe9636df2 100644 --- a/libobs-opengl/GL/glx_obs.c +++ b/libobs-opengl/GL/glx_obs.c @@ -44,6 +44,7 @@ static void* SunGetProcAddress (const GLubyte* name) #ifdef _MSC_VER #pragma warning(disable: 4055) #pragma warning(disable: 4054) +#pragma warning(disable: 4996) #endif static int TestPointer(const PROC pTest) diff --git a/libobs-opengl/GL/wgl_obs.c b/libobs-opengl/GL/wgl_obs.c index 9bf74bbd5..ca2b67762 100644 --- a/libobs-opengl/GL/wgl_obs.c +++ b/libobs-opengl/GL/wgl_obs.c @@ -44,6 +44,7 @@ static void* SunGetProcAddress (const GLubyte* name) #ifdef _MSC_VER #pragma warning(disable: 4055) #pragma warning(disable: 4054) +#pragma warning(disable: 4996) #endif static int TestPointer(const PROC pTest) -- GitLab