norohind/kmscon
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

test_output: always use blitting backend

Browse Source 
This removes the currently non-working OpenGL test and always uses the
blitting functions.

Signed-off-by: David Herrmann <dh.herrmann@googlemail.com>
This commit is contained in:
David Herrmann 2012-08-11 13:21:15 +02:00
parent faa12b6a61
commit ea62198b6e
1 changed files with 1 additions and 96 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

97
tests/test_output.c
View File

@ -35,11 +35,9 @@
*
* This would show a test screen:
* $ ./test_output something
* The test screen is a colored quad with 4 different colors in each corner.
*/
#include <errno.h>
#include <GL/gl.h>
#include <inttypes.h>
#include <stdio.h>
#include <stdlib.h>
@ -47,7 +45,6 @@
#include <unistd.h>
#include "eloop.h"
#include "gl.h"
#include "log.h"
#include "uterm.h"
#include "test_include.h"
@ -55,15 +52,6 @@
/* eloop object */
static struct ev_eloop *eloop;
/* a colored quad */
float d_vert[] = { -1, -1, 1, -1, -1, 1, 1, -1, 1, 1, -1, 1 };
float d_col[] = { 1, 1, 0, 1,
1, 1, 1, 1,
0, 1, 1, 1,
1, 1, 1, 1,
0, 0, 1, 1,
0, 1, 1, 1 };
static int blit_outputs(struct uterm_video *video)
{
struct uterm_display *iter;
@ -125,84 +113,6 @@ static int blit_outputs(struct uterm_video *video)
return 0;
}
static int set_outputs(struct uterm_video *video)
{
struct uterm_display *iter;
int j, ret;
struct gl_shader *shader;
struct uterm_screen *screen;
ret = gl_shader_new(&shader);
if (ret) {
log_err("Cannot create shader: %d", ret);
return ret;
}
j = 0;
iter = uterm_video_get_displays(video);
for ( ; iter; iter = uterm_display_next(iter)) {
log_notice("Activating display %d %p...", j, iter);
ret = uterm_display_activate(iter, NULL);
if (ret)
log_err("Cannot activate display %d: %d", j, ret);
else
log_notice("Successfully activated display %d", j);
ret = uterm_display_set_dpms(iter, UTERM_DPMS_ON);
if (ret)
log_err("Cannot set DPMS to ON: %d", ret);
++j;
}
iter = uterm_video_get_displays(video);
for ( ; iter; iter = uterm_display_next(iter)) {
if (uterm_display_get_state(iter) != UTERM_DISPLAY_ACTIVE)
continue;
ret = uterm_screen_new_single(&screen, iter);
if (ret) {
log_err("Cannot create temp-screen object: %d", ret);
continue;
}
ret = uterm_screen_use(screen);
if (ret) {
log_err("Cannot use screen: %d", ret);
uterm_screen_unref(screen);
continue;
}
glClearColor(0.0f, 0.0f, 0.0f, 1.0f);
glClear(GL_COLOR_BUFFER_BIT);
glViewport(0, 0,
uterm_screen_width(screen),
uterm_screen_height(screen));
gl_shader_draw_def(shader, d_vert, d_col, 6);
if (gl_has_error())
log_err("GL error occurred");
ret = uterm_screen_swap(screen);
if (ret) {
log_err("Cannot swap screen: %d", ret);
uterm_screen_unref(screen);
continue;
}
log_notice("Successfully set screen on display %p", iter);
uterm_screen_unref(screen);
}
log_notice("Waiting 5 seconds...");
ev_eloop_run(eloop, 5000);
log_notice("Exiting...");
gl_shader_unref(shader);
return 0;
}
static int list_outputs(struct uterm_video *video)
{
struct uterm_display *iter;
@ -279,12 +189,7 @@ int main(int argc, char **argv)
goto err_unref;
}
} else {
ret = uterm_video_use(video);
if (ret)
ret = blit_outputs(video);
else
ret = set_outputs(video);
ret = blit_outputs(video);
if (ret) {
log_err("Cannot set outputs: %d", ret);
goto err_unref;