Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Open sidebar
halo
frameworks_native
Commits
6410c8c4
Commit
6410c8c4
authored
11 years ago
by
Andy McFadden
Committed by
Android (Google) Code Review
11 years ago
Browse files
Options
Download
Plain Diff
Merge "Use black for blackout layer" into klp-dev
parents
9c0dfa09
c6f21695
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
2 additions
and
2 deletions
+2
-2
services/surfaceflinger/RenderEngine/GLES11RenderEngine.cpp
services/surfaceflinger/RenderEngine/GLES11RenderEngine.cpp
+1
-1
services/surfaceflinger/RenderEngine/GLES20RenderEngine.cpp
services/surfaceflinger/RenderEngine/GLES20RenderEngine.cpp
+1
-1
No files found.
services/surfaceflinger/RenderEngine/GLES11RenderEngine.cpp
View file @
6410c8c4
...
...
@@ -46,7 +46,7 @@ GLES11RenderEngine::GLES11RenderEngine() {
}
}
pack565
;
const
uint16_t
protTexData
[]
=
{
pack565
(
0x03
,
0x03
,
0x03
)
};
const
uint16_t
protTexData
[]
=
{
0
};
glGenTextures
(
1
,
&
mProtectedTexName
);
glBindTexture
(
GL_TEXTURE_2D
,
mProtectedTexName
);
glTexParameterx
(
GL_TEXTURE_2D
,
GL_TEXTURE_MAG_FILTER
,
GL_NEAREST
);
...
...
This diff is collapsed.
Click to expand it.
services/surfaceflinger/RenderEngine/GLES20RenderEngine.cpp
View file @
6410c8c4
...
...
@@ -50,7 +50,7 @@ GLES20RenderEngine::GLES20RenderEngine() :
}
}
pack565
;
const
uint16_t
protTexData
[]
=
{
pack565
(
0x03
,
0x03
,
0x03
)
};
const
uint16_t
protTexData
[]
=
{
0
};
glGenTextures
(
1
,
&
mProtectedTexName
);
glBindTexture
(
GL_TEXTURE_2D
,
mProtectedTexName
);
glTexParameteri
(
GL_TEXTURE_2D
,
GL_TEXTURE_MAG_FILTER
,
GL_NEAREST
);
...
...
This diff is collapsed.
Click to expand it.
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