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
c5a7b690
Commit
c5a7b690
authored
Oct 26, 2011
by
daniel@transgaming.com
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix compilation due to merge issue.
Signed-off-by: Daniel Koch Author: Nicolas Capens git-svn-id:
https://angleproject.googlecode.com/svn/trunk@808
736b8ea6-26fd-11df-bfd4-992fa37f6226
parent
0d86aa7b
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
2 additions
and
2 deletions
+2
-2
version.h
src/common/version.h
+1
-1
Context.cpp
src/libGLESv2/Context.cpp
+1
-1
No files found.
src/common/version.h
View file @
c5a7b690
#define MAJOR_VERSION 0
#define MINOR_VERSION 0
#define BUILD_VERSION 0
#define BUILD_REVISION 80
7
#define BUILD_REVISION 80
8
#define STRINGIFY(x) #x
#define MACRO_STRINGIFY(x) STRINGIFY(x)
...
...
src/libGLESv2/Context.cpp
View file @
c5a7b690
...
...
@@ -2178,7 +2178,7 @@ void Context::applyTextures(SamplerType type)
{
if
(
appliedTextureSerial
[
samplerIndex
]
!=
0
)
{
d
evice
->
SetTexture
(
samplerIndex
+
d3dSamplerOffset
,
NULL
);
mD
evice
->
SetTexture
(
samplerIndex
+
d3dSamplerOffset
,
NULL
);
appliedTextureSerial
[
samplerIndex
]
=
0
;
}
}
...
...
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