diff options
| author | Liang Qi <liang.qi@theqtcompany.com> | 2015-04-22 09:04:29 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@theqtcompany.com> | 2015-04-22 09:25:54 +0200 |
| commit | aed5a7168354c6ae47687d20b4bd3f0adcc14f8e (patch) | |
| tree | d2060479a7c12fdba8c1955e5d363754feffabb8 /src/3rdparty/angle/src/libGLESv2/validationES2.h | |
| parent | d3d10cf23d61f4a011f1a7e9abdee1a92717e80f (diff) | |
| parent | 628fa13ea4d6ff0e2e2ee76c9adfc78676de3c59 (diff) | |
Merge remote-tracking branch 'origin/5.5' into dev
Conflicts:
src/corelib/statemachine/qstatemachine.cpp
src/corelib/statemachine/qstatemachine_p.h
src/gui/painting/qdrawhelper.cpp
src/plugins/platforms/xcb/qxcbnativeinterface.cpp
src/plugins/platforms/xcb/qxcbwindow.cpp
src/plugins/platforms/xcb/qxcbwindow.h
src/testlib/qtestblacklist.cpp
src/tools/qdoc/node.cpp
src/tools/qdoc/node.h
tests/auto/gui/painting/qcolor/tst_qcolor.cpp
Change-Id: I6c78b7b162001712d5774293f501b06b4ff32684
Diffstat (limited to 'src/3rdparty/angle/src/libGLESv2/validationES2.h')
| -rw-r--r-- | src/3rdparty/angle/src/libGLESv2/validationES2.h | 34 |
1 files changed, 0 insertions, 34 deletions
diff --git a/src/3rdparty/angle/src/libGLESv2/validationES2.h b/src/3rdparty/angle/src/libGLESv2/validationES2.h deleted file mode 100644 index 53a0b630ea..0000000000 --- a/src/3rdparty/angle/src/libGLESv2/validationES2.h +++ /dev/null @@ -1,34 +0,0 @@ -// -// Copyright (c) 2013 The ANGLE Project Authors. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. -// - -// validationES2.h: Validation functions for OpenGL ES 2.0 entry point parameters - -#ifndef LIBGLESV2_VALIDATION_ES2_H -#define LIBGLESV2_VALIDATION_ES2_H - -#include <GLES2/gl2.h> - -namespace gl -{ - -class Context; - -bool ValidateES2TexImageParameters(Context *context, GLenum target, GLint level, GLenum internalformat, bool isCompressed, bool isSubImage, - GLint xoffset, GLint yoffset, GLsizei width, GLsizei height, - GLint border, GLenum format, GLenum type, const GLvoid *pixels); - -bool ValidateES2CopyTexImageParameters(Context* context, GLenum target, GLint level, GLenum internalformat, bool isSubImage, - GLint xoffset, GLint yoffset, GLint x, GLint y, GLsizei width, GLsizei height, - GLint border); - -bool ValidateES2TexStorageParameters(Context *context, GLenum target, GLsizei levels, GLenum internalformat, - GLsizei width, GLsizei height); - -bool ValidES2ReadFormatType(Context *context, GLenum format, GLenum type); - -} - -#endif // LIBGLESV2_VALIDATION_ES2_H |