Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(55)

Side by Side Diff: Source/modules/webgl/WebGLRenderingContextBase.h

Issue 1326653002: Remove duplicate validateTexFuncLevel (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Created 5 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2009 Apple Inc. All rights reserved. 2 * Copyright (C) 2009 Apple Inc. All rights reserved.
3 * 3 *
4 * Redistribution and use in source and binary forms, with or without 4 * Redistribution and use in source and binary forms, with or without
5 * modification, are permitted provided that the following conditions 5 * modification, are permitted provided that the following conditions
6 * are met: 6 * are met:
7 * 1. Redistributions of source code must retain the above copyright 7 * 1. Redistributions of source code must retain the above copyright
8 * notice, this list of conditions and the following disclaimer. 8 * notice, this list of conditions and the following disclaimer.
9 * 2. Redistributions in binary form must reproduce the above copyright 9 * 2. Redistributions in binary form must reproduce the above copyright
10 * notice, this list of conditions and the following disclaimer in the 10 * notice, this list of conditions and the following disclaimer in the
(...skipping 871 matching lines...) Expand 10 before | Expand all | Expand 10 after
882 bool validateTexFuncParameters(const char* functionName, TexImageFunctionTyp e, GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei hei ght, GLint border, GLenum format, GLenum type); 882 bool validateTexFuncParameters(const char* functionName, TexImageFunctionTyp e, GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei hei ght, GLint border, GLenum format, GLenum type);
883 883
884 enum NullDisposition { 884 enum NullDisposition {
885 NullAllowed, 885 NullAllowed,
886 NullNotAllowed 886 NullNotAllowed
887 }; 887 };
888 888
889 // Helper function to validate that the given ArrayBufferView 889 // Helper function to validate that the given ArrayBufferView
890 // is of the correct type and contains enough data for the texImage call. 890 // is of the correct type and contains enough data for the texImage call.
891 // Generates GL error and returns false if parameters are invalid. 891 // Generates GL error and returns false if parameters are invalid.
892 bool validateTexFuncData(const char* functionName, GLint level, GLsizei widt h, GLsizei height, GLenum internalformat, GLenum format, GLenum type, DOMArrayBu fferView* pixels, NullDisposition); 892 bool validateTexFuncData(const char* functionName, GLint level, GLsizei widt h, GLsizei height, GLenum format, GLenum type, DOMArrayBufferView* pixels, NullD isposition);
893 893
894 // Helper function to validate that a copyTexSubImage call is valid. 894 // Helper function to validate that a copyTexSubImage call is valid.
895 bool validateCopyTexSubImage(const char* functionName, GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLint x, GLint y, GLsizei wi dth, GLsizei height); 895 bool validateCopyTexSubImage(const char* functionName, GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLint x, GLint y, GLsizei wi dth, GLsizei height);
896 896
897 // Helper function to validate a given texture format is settable as in 897 // Helper function to validate a given texture format is settable as in
898 // you can supply data to texImage2D, or call texImage2D, copyTexImage2D and 898 // you can supply data to texImage2D, or call texImage2D, copyTexImage2D and
899 // copyTexSubImage2D. 899 // copyTexSubImage2D.
900 // Generates GL error and returns false if the format is not settable. 900 // Generates GL error and returns false if the format is not settable.
901 bool validateSettableTexFormat(const char* functionName, GLenum format); 901 bool validateSettableTexFormat(const char* functionName, GLenum format);
902 902
(...skipping 170 matching lines...) Expand 10 before | Expand all | Expand 10 after
1073 static IntSize oldestContextSize(); 1073 static IntSize oldestContextSize();
1074 }; 1074 };
1075 1075
1076 DEFINE_TYPE_CASTS(WebGLRenderingContextBase, CanvasRenderingContext, context, co ntext->is3d(), context.is3d()); 1076 DEFINE_TYPE_CASTS(WebGLRenderingContextBase, CanvasRenderingContext, context, co ntext->is3d(), context.is3d());
1077 1077
1078 } // namespace blink 1078 } // namespace blink
1079 1079
1080 WTF_ALLOW_MOVE_INIT_AND_COMPARE_WITH_MEM_FUNCTIONS(blink::WebGLRenderingContextB ase::TextureUnitState); 1080 WTF_ALLOW_MOVE_INIT_AND_COMPARE_WITH_MEM_FUNCTIONS(blink::WebGLRenderingContextB ase::TextureUnitState);
1081 1081
1082 #endif // WebGLRenderingContextBase_h 1082 #endif // WebGLRenderingContextBase_h
OLDNEW
« no previous file with comments | « no previous file | Source/modules/webgl/WebGLRenderingContextBase.cpp » ('j') | Source/modules/webgl/WebGLRenderingContextBase.cpp » ('J')

Powered by Google App Engine
This is Rietveld 408576698