diff options
| author | Lioncash <mathew1800@gmail.com> | 2015-11-03 19:24:10 -0500 |
|---|---|---|
| committer | Lioncash <mathew1800@gmail.com> | 2015-11-03 19:24:10 -0500 |
| commit | 9cc4cffa1d3618a875b0c9070c4e26cf3074036d (patch) | |
| tree | 18167e53def2b07b6781df5af51e4a1c509f3700 /Source/Core | |
| parent | d3fee2b9bd31df38512ca8706c1b34ee92349971 (diff) | |
| parent | 32cdd31200a96ae30f7ed763dc653ad9ae1f3862 (diff) | |
Merge pull request #3228 from Tilka/typedef
GLExtensions: remove duplicate typedefs
Diffstat (limited to 'Source/Core')
| -rw-r--r-- | Source/Core/Common/GL/GLExtensions/ARB_copy_image.h | 3 | ||||
| -rw-r--r-- | Source/Core/Common/GL/GLExtensions/ARB_texture_storage_multisample.h | 3 |
2 files changed, 0 insertions, 6 deletions
diff --git a/Source/Core/Common/GL/GLExtensions/ARB_copy_image.h b/Source/Core/Common/GL/GLExtensions/ARB_copy_image.h index 1a6c9410e6..cb3e1a4367 100644 --- a/Source/Core/Common/GL/GLExtensions/ARB_copy_image.h +++ b/Source/Core/Common/GL/GLExtensions/ARB_copy_image.h @@ -4,7 +4,4 @@ #include "Common/GL/GLExtensions/gl_common.h" -typedef void (GLAPIENTRY * PFNGLCOPYIMAGESUBDATAPROC) (GLuint srcName, GLenum srcTarget, GLint srcLevel, GLint srcX, GLint srcY, GLint srcZ, GLuint dstName, GLenum dstTarget, GLint dstLevel, GLint dstX, GLint dstY, GLint dstZ, GLsizei srcWidth, GLsizei srcHeight, GLsizei srcDepth); - extern PFNGLCOPYIMAGESUBDATAPROC glCopyImageSubData; - diff --git a/Source/Core/Common/GL/GLExtensions/ARB_texture_storage_multisample.h b/Source/Core/Common/GL/GLExtensions/ARB_texture_storage_multisample.h index dc52334120..54806a0242 100644 --- a/Source/Core/Common/GL/GLExtensions/ARB_texture_storage_multisample.h +++ b/Source/Core/Common/GL/GLExtensions/ARB_texture_storage_multisample.h @@ -4,8 +4,5 @@ #include "Common/GL/GLExtensions/gl_common.h" -typedef void (*PFNGLTEXSTORAGE2DMULTISAMPLEPROC) (GLenum target, GLsizei samples, GLenum internalformat, GLsizei width, GLsizei height, GLboolean fixedsamplelocations); -typedef void (*PFNGLTEXSTORAGE3DMULTISAMPLEPROC) (GLenum target, GLsizei samples, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth, GLboolean fixedsamplelocations); - extern PFNGLTEXSTORAGE2DMULTISAMPLEPROC glTexStorage2DMultisample; extern PFNGLTEXSTORAGE3DMULTISAMPLEPROC glTexStorage3DMultisample; |