Hash :
9f088621
Author :
Date :
2018-12-29T20:46:15
Revert "Load entry points dynamically in tests and samples." This reverts commit 03923558a7103827ffec6a4d2a1453ed91f01c6f. Reason for revert: fails compilation on Android, ChromeOS and Fuchsia during roll https://chromium-review.googlesource.com/c/chromium/src/+/1392624 Original change's description: > Load entry points dynamically in tests and samples. > > This CL adds a dynamic loader generator based on XML files. It also > refactors the entry point generation script to move the XML parsing > into a helper class. > > Additionally this includes a new GLES 1.0 base header. The new > header allows for function pointer types and hiding prototypes. > > All tests and samples now load ANGLE dynamically. In the future this > will be extended to load entry points from the driver directly when > possible. This will allow us to perform more accurate A/B testing. > > The new build configuration leads to some tests having more warnings > applied. The CL includes fixes for the new warnings. > > Bug: angleproject:2995 > Change-Id: I6726d4163f7a6e54d2482f094c0a952f59702a05 > Reviewed-on: https://chromium-review.googlesource.com/c/1359516 > Commit-Queue: Jamie Madill <jmadill@chromium.org> > Reviewed-by: Shahbaz Youssefi <syoussefi@chromium.org> TBR=ynovikov@chromium.org,jmadill@chromium.org,syoussefi@chromium.org Change-Id: I902bec2d733c2b879be29c02ab52a0b7d4eaa077 No-Presubmit: true No-Tree-Checks: true No-Try: true Bug: angleproject:2995 Reviewed-on: https://chromium-review.googlesource.com/c/1392381 Reviewed-by: Yuly Novikov <ynovikov@chromium.org> Commit-Queue: Yuly Novikov <ynovikov@chromium.org>
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136
//
// Copyright The ANGLE Project Authors. All rights reserved.
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
//
// WindowTest.cpp: Sample used to test various function of OSWindow
#include <algorithm>
#include <iostream>
#include "OSWindow.h"
#include "system_utils.h"
int main(int argc, char *argv[])
{
OSWindow *window = CreateOSWindow();
int width = 400;
int height = 400;
int x = 0;
int y = 0;
if (!window->initialize("Window Test", width, height))
{
return -1;
}
window->setVisible(true);
window->setPosition(x, y);
bool running = true;
while (running)
{
Event event;
while (window->popEvent(&event))
{
if (event.Type == Event::EVENT_CLOSED)
{
running = false;
break;
}
if (event.Type == Event::EVENT_KEY_PRESSED)
{
int newWidth = width;
int newHeight = height;
int newX = x;
int newY = y;
switch (event.Key.Code)
{
case KEY_ESCAPE:
running = false;
break;
case KEY_W:
newWidth = std::max(0, width + (event.Key.Shift ? -20 : 20));
break;
case KEY_H:
newHeight = std::max(0, height + (event.Key.Shift ? -20 : 20));
break;
case KEY_LEFT:
newX = x - 20;
break;
case KEY_RIGHT:
newX = x + 20;
break;
case KEY_UP:
newY = y - 20;
break;
case KEY_DOWN:
newY = y + 20;
break;
case KEY_C:
window->setMousePosition(width / 2, height / 2);
break;
case KEY_T:
window->signalTestEvent();
window->messageLoop();
if (window->didTestEventFire())
{
std::cout << "Test event did fire" << std::endl;
}
else
{
std::cout << "Test event did not fire" << std::endl;
}
break;
case KEY_S:
window->setVisible(false);
window->messageLoop();
angle::Sleep(1000);
window->setVisible(true);
window->messageLoop();
break;
default:
break;
}
if (newWidth != width || newHeight != height)
{
width = newWidth;
height = newHeight;
window->resize(width, height);
}
if (newX != x || newY != y)
{
x = newX;
y = newY;
window->setPosition(x, y);
}
angle::Sleep(0);
window->messageLoop();
if (window->getWidth() != width || window->getHeight() != height)
{
std::cout << "Discrepancy between set dimensions and retrieved dimensions" << std::endl;
std::cout << "Width: " << width << " vs. " << window->getWidth() << std::endl;
std::cout << "Height: " << height << " vs. " << window->getHeight() << std::endl;
}
if (window->getX() != x || window->getY() != y)
{
std::cout << "Discrepancy between set position and retrieved position" << std::endl;
std::cout << "X: " << x << " vs. " << window->getX() << std::endl;
std::cout << "Y: " << y << " vs. " << window->getY() << std::endl;
}
}
}
angle::Sleep(0);
window->messageLoop();
}
window->destroy();
}