#include <stdio.h>
-#include "miniglut.h"
+#include <string.h>
+#include <errno.h>
+#include "opengl.h"
+#include <GL/freeglut.h>
#include "erebus.h"
+#include "sdr.h"
+#ifdef __unix__
+#include <unistd.h>
+#include <sys/select.h>
+#include <X11/Xlib.h>
+#include <GL/glx.h>
+
+static Display *dpy;
+static int pfd[2];
+#endif
+
+#define post_redisplay() do { glutPostRedisplay(); redisp_pending = 1; } while(0)
+
+static void jobdone(unsigned int job, struct erb_rect *rect, void *cls);
static void display(void);
static void reshape(int x, int y);
static void keyb(unsigned char key, int x, int y);
static void mouse(int bn, int st, int x, int y);
static void motion(int x, int y);
+static void dummy_idle(void) {}
+
static int win_width, win_height;
static float win_aspect;
+static int reshape_pending, redisp_pending;
+static int quit;
static struct erb_rend *erb;
static int drag_x, drag_y;
static int drag;
+static float disp_gamma = 2.2f;
+
+static unsigned int fbtex;
+static unsigned int sdr;
+
+static const char *vs_src =
+ "void main()\n"
+ "{\n"
+ " gl_Position = ftransform();\n"
+ " gl_TexCoord[0] = gl_MultiTexCoord0;\n"
+ "}\n";
+
+static const char *ps_src =
+ "uniform sampler2D tex;\n"
+ "uniform float inv_gamma;\n"
+ "\n"
+ "void main()\n"
+ "{\n"
+ " vec4 texel = texture2D(tex, gl_TexCoord[0].st);\n"
+ " gl_FragColor.rgb = pow(texel.xyz / texel.w, vec3(inv_gamma));\n"
+ " gl_FragColor.a = 1.0;\n"
+ "}\n";
+
int main(int argc, char **argv)
{
+ unsigned int vs, ps;
+
+#ifdef __unix__
+ int xfd, maxfd;
+
+ pipe(pfd);
+#endif
+
glutInit(&argc, argv);
glutInitDisplayMode(GLUT_RGB | GLUT_DOUBLE);
glutInitWindowSize(1280, 800);
glutCreateWindow("X erebus");
glutDisplayFunc(display);
+ glutIdleFunc(dummy_idle); /* we want to be blocking in select, not in glutMainLoopEvent */
glutReshapeFunc(reshape);
glutKeyboardFunc(keyb);
glutMouseFunc(mouse);
glutMotionFunc(motion);
+ if(!(vs = create_vertex_shader(vs_src))) {
+ return 1;
+ }
+ if(!(ps = create_pixel_shader(ps_src))) {
+ return 1;
+ }
+ if(!(sdr = create_program_link(vs, ps, 0))) {
+ return 1;
+ }
+ set_uniform_float(sdr, "inv_gamma", 1.0f / disp_gamma);
+
if(!(erb = erb_create())) {
return 1;
}
- reshape_pending = 1;
+ erb_set_done_callback(erb, jobdone, 0);
+
+ reshape_pending = redisp_pending = 1;
+
+ glGenTextures(1, &fbtex);
+ glBindTexture(GL_TEXTURE_2D, fbtex);
+ glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST);
+ glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
+
+#ifdef __unix__
+ dpy = glXGetCurrentDisplay();
+ xfd = ConnectionNumber(dpy);
+ maxfd = xfd > pfd[0] ? xfd : pfd[0];
+
+ while(!quit) {
+ struct timeval tv = {0, 0};
+ fd_set rdset;
+
+ FD_ZERO(&rdset);
+ FD_SET(xfd, &rdset);
+ FD_SET(pfd[0], &rdset);
+
+ if(select(maxfd + 1, &rdset, 0, 0, redisp_pending ? &tv : 0) == -1) {
+ if(errno == EINTR) continue;
+ fprintf(stderr, "select failed: %s\n", strerror(errno));
+ break;
+ }
+
+ if(FD_ISSET(pfd[0], &rdset)) {
+ struct erb_rect rect;
+ read(pfd[0], &rect, sizeof rect);
+ glTexSubImage2D(GL_TEXTURE_2D, 0, rect.x, rect.y, rect.w, rect.h,
+ GL_RGBA, GL_FLOAT, erb_getframe(erb) + (rect.y * win_width + rect.x) * 4);
+ post_redisplay();
+ }
+
+ if(FD_ISSET(xfd, &rdset) || redisp_pending) {
+ redisp_pending = 0;
+ glutMainLoopEvent();
+ }
+ }
+#endif /* __unix__ */
- glutMainLoop();
erb_destroy(erb);
return 0;
}
+static void jobdone(unsigned int job, struct erb_rect *rect, void *cls)
+{
+ write(pfd[1], rect, sizeof *rect);
+}
+
static void display(void)
{
if(reshape_pending) {
reshape_pending = 0;
- erb_allocframe(erb, x, y);
+ erb_allocframe(erb, win_width, win_height);
erb_begin(erb);
- glTexImage2D(GL_TEXTURE_2D, 0, GL_RGB32F, win_width, win_height, 0,
- GL_RGB, GL_FLOAT, erb_getframe(erb));
+ glPixelStorei(GL_UNPACK_ROW_LENGTH, win_width);
+
+ glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA32F, win_width, win_height, 0,
+ GL_RGBA, GL_FLOAT, erb_getframe(erb));
}
- /* TODO: continue with getting notified when a block is done rendering */
glClear(GL_COLOR_BUFFER_BIT);
+ glUseProgram(sdr);
+
+ glBegin(GL_QUADS);
+ glColor3f(1, 1, 1);
+ glTexCoord2f(0, 0);
+ glVertex2f(0, 0);
+ glTexCoord2f(1, 0);
+ glVertex2f(win_width, 0);
+ glTexCoord2f(1, 1);
+ glVertex2f(win_width, win_height);
+ glTexCoord2f(0, 1);
+ glVertex2f(0, win_height);
+ glEnd();
+
if(drag) {
+ glUseProgram(0);
+
glEnable(GL_LOGIC_OP);
glLogicOp(GL_XOR);
glOrtho(0, x, y, 0, -1, 1);
reshape_pending = 1;
- glutPostRedisplay();
+ post_redisplay();
}
static void keyb(unsigned char key, int x, int y)
{
if(key == 27) {
glutExit();
+ quit = 1;
}
+ post_redisplay();
}
static void mouse(int bn, int st, int x, int y)
drag_x = x;
drag_y = y;
} else {
- drag = 0;
+ if(drag) {
+ drag = 0;
- rect[0] = x < drag_x ? x : drag_x;
- rect[1] = y < drag_y ? y : drag_y;
- rect[2] = abs(x - drag_x);
- rect[3] = abs(y - drag_y);
- printf("rect: %d,%d %dx%d\n", rect[0], rect[1], rect[2], rect[3]);
+ rect[0] = x < drag_x ? x : drag_x;
+ rect[1] = y < drag_y ? y : drag_y;
+ rect[2] = abs(x - drag_x);
+ rect[3] = abs(y - drag_y);
+
+ erb_queue_block(erb, 0, rect[0], rect[1], rect[2], rect[3]);
+ printf("rect: %d,%d %dx%d\n", rect[0], rect[1], rect[2], rect[3]);
+ }
}
- glutPostRedisplay();
+ post_redisplay();
+ }
+ if(bn == 2 && st == GLUT_DOWN) {
+ drag = 0;
+ post_redisplay();
}
}
mouse_x = x;
mouse_y = y;
- glutPostRedisplay();
+ post_redisplay();
}
projects / erebus2020 / blobdiff