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

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

Issue 1543233002: Unify validation for TexImage{2D|3D} (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years 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 911 matching lines...) Expand 10 before | Expand all | Expand 10 after
922 SourceImageData, 922 SourceImageData,
923 SourceHTMLImageElement, 923 SourceHTMLImageElement,
924 SourceHTMLCanvasElement, 924 SourceHTMLCanvasElement,
925 SourceHTMLVideoElement, 925 SourceHTMLVideoElement,
926 SourceImageBitmap, 926 SourceImageBitmap,
927 }; 927 };
928 928
929 // Helper function for tex{Sub}Image2D to check if the input format/type/lev el/target/width/height/border/xoffset/yoffset are valid. 929 // Helper function for tex{Sub}Image2D to check if the input format/type/lev el/target/width/height/border/xoffset/yoffset are valid.
930 // Otherwise, it would return quickly without doing other work. 930 // Otherwise, it would return quickly without doing other work.
931 bool validateTexFunc(const char* functionName, TexImageFunctionType, TexFunc ValidationSourceType, GLenum target, GLint level, GLenum internalformat, GLsizei width, 931 bool validateTexFunc(const char* functionName, TexImageFunctionType, TexFunc ValidationSourceType, GLenum target, GLint level, GLenum internalformat, GLsizei width,
932 GLsizei height, GLint border, GLenum format, GLenum type, GLint xoffset, GLint yoffset); 932 GLsizei height, GLsizei depth, GLint border, GLenum format, GLenum type, GLint xoffset, GLint yoffset);
933 933
934 // Helper function to check input width and height for functions {copy, comp ressed}Tex{Sub}Image. 934 // Helper function to check input width and height for functions {copy, comp ressed}Tex{Sub}Image.
935 // Generates GL error and returns false if width or height is invalid. 935 // Generates GL error and returns false if width or height is invalid.
936 bool validateTexFuncDimensions(const char* functionName, TexImageFunctionTyp e, GLenum target, GLint level, GLsizei width, GLsizei height, GLsizei depth); 936 bool validateTexFuncDimensions(const char* functionName, TexImageFunctionTyp e, GLenum target, GLint level, GLsizei width, GLsizei height, GLsizei depth);
937 937
938 // Helper function to check input parameters for functions {copy}Tex{Sub}Ima ge. 938 // Helper function to check input parameters for functions {copy}Tex{Sub}Ima ge.
939 // Generates GL error and returns false if parameters are invalid. 939 // Generates GL error and returns false if parameters are invalid.
940 bool validateTexFuncParameters(const char* functionName, TexImageFunctionTyp e, GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei hei ght, GLsizei depth, GLint border, GLenum format, GLenum type); 940 bool validateTexFuncParameters(const char* functionName, TexImageFunctionTyp e, GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei hei ght, GLsizei depth, GLint border, GLenum format, GLenum type);
941 941
942 enum NullDisposition { 942 enum NullDisposition {
(...skipping 202 matching lines...) Expand 10 before | Expand all | Expand 10 after
1145 static WebGLRenderingContextBase* oldestEvictedContext(); 1145 static WebGLRenderingContextBase* oldestEvictedContext();
1146 }; 1146 };
1147 1147
1148 DEFINE_TYPE_CASTS(WebGLRenderingContextBase, CanvasRenderingContext, context, co ntext->is3d(), context.is3d()); 1148 DEFINE_TYPE_CASTS(WebGLRenderingContextBase, CanvasRenderingContext, context, co ntext->is3d(), context.is3d());
1149 1149
1150 } // namespace blink 1150 } // namespace blink
1151 1151
1152 WTF_ALLOW_MOVE_INIT_AND_COMPARE_WITH_MEM_FUNCTIONS(blink::WebGLRenderingContextB ase::TextureUnitState); 1152 WTF_ALLOW_MOVE_INIT_AND_COMPARE_WITH_MEM_FUNCTIONS(blink::WebGLRenderingContextB ase::TextureUnitState);
1153 1153
1154 #endif // WebGLRenderingContextBase_h 1154 #endif // WebGLRenderingContextBase_h
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698