summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBrian Paul <[email protected]>2010-05-27 09:45:29 -0600
committerBrian Paul <[email protected]>2010-05-27 09:46:32 -0600
commitdf64122c30a0d3dab70ab665af84f83fa496526e (patch)
treeef38ea8dfaa023df057bf73142001c80187f59f7
parenta4bd52adbad0f24632cf3b5fd4cc127ed542a00c (diff)
fbdev: some hacking to get the driver to compile (untested)
-rw-r--r--include/GL/glfbdev.h3
-rw-r--r--src/mesa/drivers/fbdev/glfbdev.c8
2 files changed, 10 insertions, 1 deletions
diff --git a/include/GL/glfbdev.h b/include/GL/glfbdev.h
index 4e25e7b0566..452a643a443 100644
--- a/include/GL/glfbdev.h
+++ b/include/GL/glfbdev.h
@@ -27,6 +27,9 @@
#define GLFBDEV_H
+/* for size_t */
+#include <stdlib.h>
+
/* avoid including linux/fb.h */
struct fb_fix_screeninfo;
struct fb_var_screeninfo;
diff --git a/src/mesa/drivers/fbdev/glfbdev.c b/src/mesa/drivers/fbdev/glfbdev.c
index 0ea2796eaab..2ad52d89fc0 100644
--- a/src/mesa/drivers/fbdev/glfbdev.c
+++ b/src/mesa/drivers/fbdev/glfbdev.c
@@ -41,8 +41,8 @@
#ifdef USE_GLFBDEV_DRIVER
-#include <linux/fb.h>
#include "GL/glfbdev.h"
+#include <linux/fb.h>
#include "main/glheader.h"
#include "main/buffers.h"
#include "main/context.h"
@@ -216,6 +216,10 @@ viewport(GLcontext *ctx, GLint x, GLint y, GLsizei w, GLsizei h)
DST[1] = VALUE[GCOMP]; \
DST[2] = VALUE[RCOMP]; \
DST[3] = VALUE[ACOMP]
+#define STORE_PIXEL_RGB(DST, X, Y, VALUE) \
+ DST[0] = VALUE[BCOMP]; \
+ DST[1] = VALUE[GCOMP]; \
+ DST[2] = VALUE[RCOMP];
#define FETCH_PIXEL(DST, SRC) \
DST[RCOMP] = SRC[2]; \
DST[GCOMP] = SRC[1]; \
@@ -531,10 +535,12 @@ new_glfbdev_renderbuffer(void *bufferStart, const GLFBDevVisualPtr visual)
rb->Base.Width = visual->var.xres;
rb->Base.Height = visual->var.yres;
+ /*
rb->Base.RedBits = visual->var.red.length;
rb->Base.GreenBits = visual->var.green.length;
rb->Base.BlueBits = visual->var.blue.length;
rb->Base.AlphaBits = visual->var.transp.length;
+ */
rb->Base.InternalFormat = pixelFormat;
}