Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(327)

Unified Diff: remoting/client/gl_render_layer.cc

Issue 2148743005: [Remoting Android] Cursor & Cursor Feedback for OpenGL Renderer (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Swap BGRA to RGBA Created 4 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: remoting/client/gl_render_layer.cc
diff --git a/remoting/client/gl_render_layer.cc b/remoting/client/gl_render_layer.cc
index 836bcb96e55b86dc4962ae533f565544b064e7a6..caa6adaf6827b18fa5f1d7edb9b4fa72886154cb 100644
--- a/remoting/client/gl_render_layer.cc
+++ b/remoting/client/gl_render_layer.cc
@@ -49,6 +49,8 @@ void GlRenderLayer::SetTexture(const uint8_t* texture, int width, int height) {
glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA, width, height, 0, GL_RGBA,
GL_UNSIGNED_BYTE, texture);
+ glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE);
+ glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
@@ -134,10 +136,11 @@ void GlRenderLayer::SetTextureVisibleArea(
glBindBuffer(GL_ARRAY_BUFFER, 0);
}
-void GlRenderLayer::Draw() {
+void GlRenderLayer::Draw(float alpha_multiplier) {
DCHECK(thread_checker_.CalledOnValidThread());
DCHECK(texture_set_);
- canvas_->DrawTexture(texture_id_, texture_handle_, buffer_handle_);
+ canvas_->DrawTexture(texture_id_, texture_handle_, buffer_handle_,
+ alpha_multiplier);
}
} // namespace remoting

Powered by Google App Engine
This is Rietveld 408576698