fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-02-02 08:50:24 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

add support for 16bpp modes, disabled

Browse source
This commit is contained in:
Keith Whitwell 2003-01-17 16:19:15 +00:00
parent 1449a2f759
commit deb4d4de47
4 changed files with 91 additions and 39 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

82
src/mesa/drivers/dri/radeon/server/radeon_dri.c
View file

@ -821,35 +821,71 @@ static void get_chipfamily_from_chipset( RADEONInfoPtr info )
* Establish the set of visuals available for the display.
* Requires the ::__GLXvisualConfig data type.
*/
static int __driInitScreenConfigs(int *numConfigs, __GLXvisualConfig **configs)
static int __driInitScreenConfigs( struct MiniGLXDisplayRec *dpy,
int *numConfigs, __GLXvisualConfig **configs)
{
int i;
*numConfigs = 1;
*configs = (__GLXvisualConfig *) calloc(*numConfigs,
sizeof(__GLXvisualConfig));
for (i = 0; i < *numConfigs; i++) {
(*configs)[i].vid = 100 + i;
(*configs)[i].class = TrueColor;
(*configs)[i].rgba = True;
(*configs)[i].redSize = 8;
(*configs)[i].greenSize = 8;
(*configs)[i].blueSize = 8;
(*configs)[i].alphaSize = 8;
(*configs)[i].redMask = 0xff0000;
(*configs)[i].greenMask = 0xff00;
(*configs)[i].blueMask = 0xff;
(*configs)[i].alphaMask = 0xff000000;
(*configs)[i].doubleBuffer = True;
(*configs)[i].stereo = False;
(*configs)[i].bufferSize = 32;
(*configs)[i].depthSize = 24;
(*configs)[i].stencilSize = 8;
(*configs)[i].auxBuffers = 0;
(*configs)[i].level = 0;
/* leave remaining fields zero */
}
switch (dpy->bpp) {
case 32:
for (i = 0; i < *numConfigs; i++) {
(*configs)[i].vid = 100 + i;
(*configs)[i].class = TrueColor;
(*configs)[i].rgba = True;
(*configs)[i].redSize = 8;
(*configs)[i].greenSize = 8;
(*configs)[i].blueSize = 8;
(*configs)[i].alphaSize = 8;
(*configs)[i].redMask = 0xff0000;
(*configs)[i].greenMask = 0xff00;
(*configs)[i].blueMask = 0xff;
(*configs)[i].alphaMask = 0xff000000;
(*configs)[i].doubleBuffer = True;
(*configs)[i].stereo = False;
(*configs)[i].bufferSize = 32;
(*configs)[i].depthSize = 24;
(*configs)[i].stencilSize = 8;
(*configs)[i].auxBuffers = 0;
(*configs)[i].level = 0;
/* leave remaining fields zero */
}
break;
case 16:
for (i = 0; i < *numConfigs; i++) {
(*configs)[i].vid = 100 + i;
(*configs)[i].class = TrueColor;
(*configs)[i].rgba = True;
(*configs)[i].redSize = 5;
(*configs)[i].greenSize = 6;
(*configs)[i].blueSize = 5;
(*configs)[i].alphaSize = 0;
(*configs)[i].redMask = 0xf800;
(*configs)[i].greenMask = 0x07e0;
(*configs)[i].blueMask = 0x001f;
(*configs)[i].alphaMask = 0x0000;
(*configs)[i].doubleBuffer = True;
(*configs)[i].stereo = False;
(*configs)[i].bufferSize = 16;
(*configs)[i].depthSize = 16;
(*configs)[i].stencilSize = 0;
(*configs)[i].auxBuffers = 0;
(*configs)[i].level = 0;
/* leave remaining fields zero */
}
break;
default:
fprintf(stderr, "Unknown bpp in %s: %d\n", __FUNCTION__,
dpy->bpp);
exit(1);
break;
}
return 1;
}

3
src/miniglx/NOTES
View file

@ -105,10 +105,11 @@ Several bugs have been found in the radeonfb.o framebuffer driver.
or 'translated', particularly in higher resolution modes. This is
definitely a bug in radeonfb.o as this can be provoked even when using
the software dri driver (fb_dri.so). Importance: High. Workaround:
None, except restarting the application.
None, except restarting the application.
2) Modes with virtual resolutions different to displayed resolutions
do not work. Importance: medium. Workaround: Avoid these situations
by always setting the visible resolution to the virtual resolution
specified in the configuration file.

42
src/miniglx/miniglx.c
View file

@ -22,7 +22,7 @@
* CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
*/
/* $Id: miniglx.c,v 1.1.4.34 2003/01/17 00:56:14 keithw Exp $ */
/* $Id: miniglx.c,v 1.1.4.35 2003/01/17 16:19:19 keithw Exp $ */
/**
@ -351,7 +351,7 @@ SetupFBDev( Display *dpy, Window win )
dpy->VarInfo.transp.length = 8;
}
else if (dpy->VarInfo.bits_per_pixel == 16) {
assert(win->visual->pixelFormat == PF_B5G5R5);
assert(win->visual->pixelFormat == PF_B5G6R5);
dpy->VarInfo.red.offset = 11;
dpy->VarInfo.green.offset = 5;
dpy->VarInfo.blue.offset = 0;
@ -455,6 +455,7 @@ SetupFBDev( Display *dpy, Window win )
}
if (ioctl(dpy->FrameBufferFD, FBIOPUTCMAP, (void *) &cmap) < 0) {
fprintf(stderr, "ioctl(FBIOPUTCMAP) failed [%d]\n", i);
exit(1);
}
}
@ -634,10 +635,12 @@ int __read_config_file( Display *dpy )
else if (strcmp(opt, "bpp") == 0) {
if (sscanf(val, "%d", &dpy->bpp) != 1)
fprintf(stderr, "malformed bpp: %s\n", opt);
if (dpy->bpp != 32) {
fprintf(stderr, "Only 32bpp modes currently supported\n");
dpy->bpp = 32;
}
#if 1
if (dpy->bpp != 32) {
fprintf(stderr, "Only 32bpp modes currently supported\n");
dpy->bpp = 32;
}
#endif
dpy->cpp = dpy->bpp / 8;
}
}
@ -728,7 +731,7 @@ XOpenDisplay( const char *display_name )
/* Ask the driver for a list of supported configs:
*/
dpy->driver->initScreenConfigs( &dpy->numConfigs, &dpy->configs );
dpy->driver->initScreenConfigs( dpy, &dpy->numConfigs, &dpy->configs );
/* Perform the initialization normally done in the X server */
@ -887,7 +890,6 @@ XCreateWindow( Display *display, Window parent, int x, int y,
win->visual = visual; /* ptr assignment */
/* do fbdev setup
* TODO: Let the driver influence the choice of window pitch.
*/
if (!SetupFBDev(display, win)) {
FREE(win);
@ -897,10 +899,14 @@ XCreateWindow( Display *display, Window parent, int x, int y,
win->bytesPerPixel = display->bpp / 8;
win->rowStride = display->VarInfo.xres_virtual * win->bytesPerPixel;
win->size = win->rowStride * height; /* XXX stride? */
win->size = win->rowStride * height;
win->frontStart = display->FrameBuffer;
win->frontBottom = (GLubyte *) win->frontStart + (height-1) * win->rowStride;
/* This is incorrect: the hardware driver could put the backbuffer
* just about anywhere. These fields, including the above are
* hardware dependent & don't really belong here.
*/
if (visual->glxConfig->doubleBuffer) {
win->backStart = (GLubyte *) win->frontStart +
win->rowStride * display->VarInfo.yres_virtual;
@ -1115,7 +1121,12 @@ XGetVisualInfo( Display *dpy, long vinfo_mask, XVisualInfo *vinfo_template, int
visResults[i].glxConfig = dpy->configs + i;
visResults[i].visInfo = results + i;
visResults[i].dpy = dpy;
visResults[i].pixelFormat = PF_B8G8R8A8; /* XXX: FIX ME */
if (dpy->bpp == 32)
visResults[i].pixelFormat = PF_B8G8R8A8; /* XXX: FIX ME */
else
visResults[i].pixelFormat = PF_B5G6R5; /* XXX: FIX ME */
results[i].visual = visResults + i;
results[i].visualid = dpy->configs[i].vid;
results[i].class = TrueColor;
@ -1123,7 +1134,7 @@ XGetVisualInfo( Display *dpy, long vinfo_mask, XVisualInfo *vinfo_template, int
dpy->configs[i].greenSize +
dpy->configs[i].blueSize +
dpy->configs[i].alphaSize;
results[i].bits_per_rgb = 32;
results[i].bits_per_rgb = dpy->bpp;
}
*nitens_return = n;
return results;
@ -1307,9 +1318,12 @@ glXChooseVisual( Display *dpy, int screen, int *attribList )
if (rgbFlag) {
/* XXX maybe support depth 16 someday */
visInfo->class = TrueColor;
visInfo->depth = 32;
visInfo->bits_per_rgb = 32;
vis->pixelFormat = PF_B8G8R8A8;
visInfo->depth = dpy->bpp;
visInfo->bits_per_rgb = dpy->bpp;
if (dpy->bpp == 32)
vis->pixelFormat = PF_B8G8R8A8;
else
vis->pixelFormat = PF_B5G6R5;
}
else {
/* color index mode */

3
src/miniglx/miniglxP.h
View file

@ -184,7 +184,8 @@ struct __DRIdrawableRec {
* initalization and takedown routines.
*/
struct MiniGLXDriverRec {
int (*initScreenConfigs)( int *numConfigs, __GLXvisualConfig **configs );
int (*initScreenConfigs)( struct MiniGLXDisplayRec *dpy,
int *numConfigs, __GLXvisualConfig **configs );
int (*validateMode)( struct MiniGLXDisplayRec *dpy );
int (*initFBDev)( struct MiniGLXDisplayRec *dpy );
void (*haltFBDev)( struct MiniGLXDisplayRec *dpy );