Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
A
angle
Project
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Chen Yisong
angle
Commits
784a8fd5
Commit
784a8fd5
authored
Sep 24, 2013
by
Geoff Lang
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Defer early-exit due to zero-sized copies until after all other validation for CopyTex*Image.
TRAC #20925 Signed-off-by: Jamie Madill Signed-off-by: Shannon Woods
parent
1beb1db8
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
4 additions
and
12 deletions
+4
-12
validationES2.cpp
src/libGLESv2/validationES2.cpp
+2
-6
validationES3.cpp
src/libGLESv2/validationES3.cpp
+2
-6
No files found.
src/libGLESv2/validationES2.cpp
View file @
784a8fd5
...
...
@@ -487,11 +487,6 @@ bool ValidateES2CopyTexImageParameters(gl::Context* context, GLenum target, GLin
return
gl
::
error
(
GL_INVALID_VALUE
,
false
);
}
if
(
width
==
0
||
height
==
0
)
{
return
false
;
}
// Verify zero border
if
(
border
!=
0
)
{
...
...
@@ -720,7 +715,8 @@ bool ValidateES2CopyTexImageParameters(gl::Context* context, GLenum target, GLin
}
}
return
true
;
// If width or height is zero, it is a no-op. Return false without setting an error.
return
(
width
>
0
&&
height
>
0
);
}
bool
ValidateES2TexStorageParameters
(
gl
::
Context
*
context
,
GLenum
target
,
GLsizei
levels
,
GLenum
internalformat
,
...
...
src/libGLESv2/validationES3.cpp
View file @
784a8fd5
...
...
@@ -337,11 +337,6 @@ bool ValidateES3CopyTexImageParameters(gl::Context *context, GLenum target, GLin
return
gl
::
error
(
GL_INVALID_VALUE
,
false
);
}
if
(
width
==
0
||
height
==
0
)
{
return
false
;
}
if
(
border
!=
0
)
{
return
gl
::
error
(
GL_INVALID_VALUE
,
false
);
...
...
@@ -488,7 +483,8 @@ bool ValidateES3CopyTexImageParameters(gl::Context *context, GLenum target, GLin
}
}
return
true
;
// If width or height is zero, it is a no-op. Return false without setting an error.
return
(
width
>
0
&&
height
>
0
);
}
bool
ValidateES3TexStorageParameters
(
gl
::
Context
*
context
,
GLenum
target
,
GLsizei
levels
,
GLenum
internalformat
,
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment