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
5f7dc33d
Commit
5f7dc33d
authored
Dec 13, 2011
by
daniel@transgaming.com
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Use the correct function to determine texture pool
Trac #19259 Issue=269 git-svn-id:
https://angleproject.googlecode.com/svn/trunk@912
736b8ea6-26fd-11df-bfd4-992fa37f6226
parent
6a05be4c
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
4 additions
and
2 deletions
+4
-2
version.h
src/common/version.h
+1
-1
Texture.cpp
src/libGLESv2/Texture.cpp
+3
-1
No files found.
src/common/version.h
View file @
5f7dc33d
#define MAJOR_VERSION 1
#define MAJOR_VERSION 1
#define MINOR_VERSION 0
#define MINOR_VERSION 0
#define BUILD_VERSION 0
#define BUILD_VERSION 0
#define BUILD_REVISION 91
1
#define BUILD_REVISION 91
2
#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 @
5f7dc33d
...
@@ -1243,7 +1243,9 @@ void Image::copy(GLint xoffset, GLint yoffset, GLint x, GLint y, GLsizei width,
...
@@ -1243,7 +1243,9 @@ void Image::copy(GLint xoffset, GLint yoffset, GLint x, GLint y, GLsizei width,
}
}
TextureStorage
::
TextureStorage
(
bool
renderable
)
TextureStorage
::
TextureStorage
(
bool
renderable
)
:
mRenderable
(
renderable
),
mManaged
(
getDisplay
()
->
getBufferPool
(
renderable
)
==
D3DPOOL_MANAGED
),
mTextureSerial
(
issueTextureSerial
())
:
mRenderable
(
renderable
),
mManaged
(
getDisplay
()
->
getTexturePool
(
renderable
)
==
D3DPOOL_MANAGED
),
mTextureSerial
(
issueTextureSerial
())
{
{
}
}
...
...
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