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
3b3c1d43
Commit
3b3c1d43
authored
Jun 08, 2011
by
daniel@transgaming.com
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Revert copyImage changes from r682 as they cause regressions on some webpages
git-svn-id:
https://angleproject.googlecode.com/svn/trunk@684
736b8ea6-26fd-11df-bfd4-992fa37f6226
parent
82e7e9d0
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
5 additions
and
1 deletion
+5
-1
version.h
src/common/version.h
+1
-1
Texture.cpp
src/libGLESv2/Texture.cpp
+4
-0
No files found.
src/common/version.h
View file @
3b3c1d43
#define MAJOR_VERSION 0
#define MAJOR_VERSION 0
#define MINOR_VERSION 0
#define MINOR_VERSION 0
#define BUILD_VERSION 0
#define BUILD_VERSION 0
#define BUILD_REVISION 68
3
#define BUILD_REVISION 68
4
#define STRINGIFY(x) #x
#define STRINGIFY(x) #x
#define MACRO_STRINGIFY(x) STRINGIFY(x)
#define MACRO_STRINGIFY(x) STRINGIFY(x)
...
...
src/libGLESv2/Texture.cpp
View file @
3b3c1d43
...
@@ -1488,6 +1488,8 @@ void Texture2D::copyImage(GLint level, GLenum format, GLint x, GLint y, GLsizei
...
@@ -1488,6 +1488,8 @@ void Texture2D::copyImage(GLint level, GLenum format, GLint x, GLint y, GLsizei
{
{
convertToRenderTarget
();
convertToRenderTarget
();
}
}
updateTexture
();
if
(
width
!=
0
&&
height
!=
0
&&
level
<
levelCount
())
if
(
width
!=
0
&&
height
!=
0
&&
level
<
levelCount
())
{
{
...
@@ -2354,6 +2356,8 @@ void TextureCubeMap::copyImage(GLenum target, GLint level, GLenum format, GLint
...
@@ -2354,6 +2356,8 @@ void TextureCubeMap::copyImage(GLenum target, GLint level, GLenum format, GLint
{
{
convertToRenderTarget
();
convertToRenderTarget
();
}
}
updateTexture
();
ASSERT
(
width
==
height
);
ASSERT
(
width
==
height
);
...
...
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