Skip to content

A
angle
Commit 61f0db8e by Tom Anderson Committed by Commit Bot
Options

Fix GCC build

Change-Id: I30e6e8d82821ed86cc7f53a48b1b23fc0cbf060c Reviewed-on: https://chromium-review.googlesource.com/446866Reviewed-by: 's avatarJamie Madill <jmadill@chromium.org> Commit-Queue: Jamie Madill <jmadill@chromium.org>
parent 200db9dc
Showing with 2 additions and 5 deletions
src/tests/test_utils/draw_call_perf_utils.h
...@@ -24,8 +24,8 @@ GLuint SetupSimpleScaleAndOffsetProgram(); ...@@ -24,8 +24,8 @@ GLuint SetupSimpleScaleAndOffsetProgram();
// Returns buffer ID filled with 2-component triangle coordinates. The buffer is left as bound. // Returns buffer ID filled with 2-component triangle coordinates. The buffer is left as bound.
// Generates triangles like this with 2-component coordinates: // Generates triangles like this with 2-component coordinates:
// A // A
// / \ // / \.
// / \ // / \.
// B-----C // B-----C
GLuint Create2DTriangleBuffer(size_t numTris, GLenum usage); GLuint Create2DTriangleBuffer(size_t numTris, GLenum usage);
......
util/x11/X11Window.cpp
...@@ -394,7 +394,6 @@ void X11Window::processEvent(const XEvent &xEvent) ...@@ -394,7 +394,6 @@ void X11Window::processEvent(const XEvent &xEvent)
{ {
Event event; Event event;
MouseButton button = MOUSEBUTTON_UNKNOWN; MouseButton button = MOUSEBUTTON_UNKNOWN;
int wheelX = 0;
int wheelY = 0; int wheelY = 0;
// The mouse wheel updates are sent via button events. // The mouse wheel updates are sent via button events.
...@@ -407,10 +406,8 @@ void X11Window::processEvent(const XEvent &xEvent) ...@@ -407,10 +406,8 @@ void X11Window::processEvent(const XEvent &xEvent)
wheelY = -1; wheelY = -1;
break; break;
case 6: case 6:
wheelX = 1;
break; break;
case 7: case 7:
wheelX = -1;
break; break;
case Button1: case Button1:
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment