brkho
/
mesa
Следить 1
В избранное 0
Форкнуть 0
Код Релизы 562 Вики Активность
Просмотр исходного кода

Remove files not used in current MGA driver

tags/vtx-0-2-21112003-freeze
Jon Smirl 23 лет назад
Родитель
1da1f1e4ba
Сommit
e28a4c147c
3 измененных файлов: 0 добавлений и 584 удалений
Разделённый вид Показать статистику Diff
  1. 0
    291
      src/mesa/drivers/dri/mga/mgabuffers.c
  2. 0
    37
      src/mesa/drivers/dri/mga/mgabuffers.h
  3. 0
    256
      src/mesa/drivers/dri/mga/mgatexcnv.c

+ 0
- 291
src/mesa/drivers/dri/mga/mgabuffers.c Просмотреть файл

@@ -1,291 +0,0 @@
/*
* Copyright 2000-2001 VA Linux Systems, Inc.
* All Rights Reserved.
*
* Permission is hereby granted, free of charge, to any person obtaining a
* copy of this software and associated documentation files (the "Software"),
* to deal in the Software without restriction, including without limitation
* on the rights to use, copy, modify, merge, publish, distribute, sub
* license, and/or sell copies of the Software, and to permit persons to whom
* the Software is furnished to do so, subject to the following conditions:
*
* The above copyright notice and this permission notice (including the next
* paragraph) shall be included in all copies or substantial portions of the
* Software.
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
* FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT. IN NO EVENT SHALL
* VA LINUX SYSTEMS AND/OR ITS SUPPLIERS BE LIABLE FOR ANY CLAIM, DAMAGES OR
* OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
* ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
* OTHER DEALINGS IN THE SOFTWARE.
*
* Authors:
* Keith Whitwell <keith@tungstengraphics.com>
*/
/* $XFree86: xc/lib/GL/mesa/src/drv/mga/mgabuffers.c,v 1.13 2002/11/05 17:46:08 tsi Exp $ */

#include <stdio.h>
#include "mgacontext.h"
#include "mgabuffers.h"
#include "mgastate.h"
#include "mgaioctl.h"
#include "mgatris.h"

static void mgaXMesaSetFrontClipRects( mgaContextPtr mmesa )
{
__DRIdrawablePrivate *driDrawable = mmesa->driDrawable;

/* fprintf( stderr, "%s\n", __FUNCTION__ );*/

if (driDrawable->numClipRects == 0) {
static XF86DRIClipRectRec zeroareacliprect = {0,0,0,0};
mmesa->numClipRects = 1;
mmesa->pClipRects = &zeroareacliprect;
} else {
mmesa->numClipRects = driDrawable->numClipRects;
mmesa->pClipRects = driDrawable->pClipRects;
}
mmesa->drawX = driDrawable->x;
mmesa->drawY = driDrawable->y;

mmesa->setup.dstorg = mmesa->drawOffset;
mmesa->dirty |= MGA_UPLOAD_CONTEXT | MGA_UPLOAD_CLIPRECTS;
}


static void mgaXMesaSetBackClipRects( mgaContextPtr mmesa )
{
__DRIdrawablePrivate *driDrawable = mmesa->driDrawable;

/* fprintf( stderr, "%s\n", __FUNCTION__ );*/

if (driDrawable->numBackClipRects == 0)
{
if (driDrawable->numClipRects == 0) {
static XF86DRIClipRectRec zeroareacliprect = {0,0,0,0};
mmesa->numClipRects = 1;
mmesa->pClipRects = &zeroareacliprect;
} else {
mmesa->numClipRects = driDrawable->numClipRects;
mmesa->pClipRects = driDrawable->pClipRects;
}
mmesa->drawX = driDrawable->x;
mmesa->drawY = driDrawable->y;
} else {
mmesa->numClipRects = driDrawable->numBackClipRects;
mmesa->pClipRects = driDrawable->pBackClipRects;
mmesa->drawX = driDrawable->backX;
mmesa->drawY = driDrawable->backY;
}

mmesa->setup.dstorg = mmesa->drawOffset;
mmesa->dirty |= MGA_UPLOAD_CONTEXT | MGA_UPLOAD_CLIPRECTS;
}



#if 0
static void mgaUpdateRectsFromSarea( mgaContextPtr mmesa )
{
__DRIdrawablePrivate *driDrawable = mmesa->driDrawable;
__DRIscreenPrivate *driScreen = mmesa->driScreen;
MGASAREAPrivPtr sarea = mmesa->sarea;
int i = 0, top = 0;


if (sarea->exported_buffers & MGA_BACK) {

driDrawable->numBackClipRects = sarea->exported_nback;
driDrawable->pBackClipRects = mmesa->tmp_boxes[0];

top = sarea->exported_nback;
for (i = 0 ; i < top ; i++)
driDrawable->pBackClipRects[i] =
*(XF86DRIClipRectPtr)&(sarea->exported_boxes[i]);
}


if (sarea->exported_buffers & MGA_FRONT)
{
int start = top;

driDrawable->numClipRects = sarea->exported_nfront;
driDrawable->pClipRects = mmesa->tmp_boxes[1];

top += sarea->exported_nfront;
for ( ; i < top ; i++)
driDrawable->pClipRects[i-start] =
*(XF86DRIClipRectPtr)&(sarea->exported_boxes[i]);

}



driDrawable->index = sarea->exported_index;
driDrawable->lastStamp = sarea->exported_stamp;
driDrawable->x = sarea->exported_front_x;
driDrawable->y = sarea->exported_front_y;
driDrawable->backX = sarea->exported_back_x;
driDrawable->backY = sarea->exported_back_y;
driDrawable->w = sarea->exported_w;
driDrawable->h = sarea->exported_h;
driDrawable->pStamp =
&(driScreen->pSAREA->drawableTable[driDrawable->index].stamp);

mmesa->dirty_cliprects = (MGA_FRONT|MGA_BACK) & ~(sarea->exported_buffers);
}
#endif

#if 0
static void printSareaRects( mgaContextPtr mmesa )
{
__DRIscreenPrivate *driScreen = mmesa->driScreen;
MGASAREAPrivPtr sarea = mmesa->sarea;
int i;

fprintf(stderr, "sarea->exported: %d\n", sarea->exported_drawable);
fprintf(stderr, "sarea->exported_index: %d\n", sarea->exported_index);
fprintf(stderr, "sarea->exported_stamp: %d\n", sarea->exported_stamp);
fprintf(stderr, "sarea->exported_front_x: %d\n", sarea->exported_front_x);
fprintf(stderr, "sarea->exported_front_y: %d\n", sarea->exported_front_y);
fprintf(stderr, "sarea->exported_back_x: %d\n", sarea->exported_back_x);
fprintf(stderr, "sarea->exported_back_y: %d\n", sarea->exported_back_y);
fprintf(stderr, "sarea->exported_w: %d\n", sarea->exported_w);
fprintf(stderr, "sarea->exported_h: %d\n", sarea->exported_h);
fprintf(stderr, "sarea->exported_buffers: %d\n", sarea->exported_buffers);
fprintf(stderr, "sarea->exported_nfront: %d\n", sarea->exported_nfront);
fprintf(stderr, "sarea->exported_nback: %d\n", sarea->exported_nback);

i = 0;
if (sarea->exported_buffers & MGA_BACK)
for ( ; i < sarea->exported_nback ; i++)
fprintf(stderr, "back %d: %d,%d-%d,%d\n", i,
sarea->exported_boxes[i].x1, sarea->exported_boxes[i].y1,
sarea->exported_boxes[i].x2, sarea->exported_boxes[i].y2);

if (sarea->exported_buffers & MGA_FRONT) {
int start = i;
int top = i + sarea->exported_nfront;
for ( ; i < top ; i++)
fprintf(stderr, "front %d: %d,%d-%d,%d\n",
i - start,
sarea->exported_boxes[i].x1, sarea->exported_boxes[i].y1,
sarea->exported_boxes[i].x2, sarea->exported_boxes[i].y2);
}

fprintf(stderr, "drawableTable[%d].stamp: %d\n",
sarea->exported_index,
driScreen->pSAREA->drawableTable[sarea->exported_index].stamp);
}

static void printMmesaRects( mgaContextPtr mmesa )
{
__DRIscreenPrivate *driScreen = mmesa->driScreen;
__DRIdrawablePrivate *driDrawable = mmesa->driDrawable;
int nr = mmesa->numClipRects;
int i;

fprintf(stderr, "driDrawable->draw: %ld\n", driDrawable->draw);
fprintf(stderr, "driDrawable->index: %d\n", driDrawable->index);
fprintf(stderr, "driDrawable->lastStamp: %d\n", driDrawable->lastStamp);
fprintf(stderr, "mmesa->drawX: %d\n", mmesa->drawX);
fprintf(stderr, "mmesa->drawY: %d\n", mmesa->drawY);
fprintf(stderr, "driDrawable->w: %d\n", driDrawable->w);
fprintf(stderr, "driDrawable->h: %d\n", driDrawable->h);

for (i = 0 ; i < nr ; i++)
fprintf(stderr, "box %d: %d,%d-%d,%d\n", i,
mmesa->pClipRects[i].x1, mmesa->pClipRects[i].y1,
mmesa->pClipRects[i].x2, mmesa->pClipRects[i].y2);

fprintf(stderr, "mmesa->draw_buffer: %d\n", mmesa->draw_buffer);
fprintf(stderr, "drawableTable[%d].stamp: %d\n",
driDrawable->index,
driScreen->pSAREA->drawableTable[driDrawable->index].stamp);
}
#endif



void mgaUpdateRects( mgaContextPtr mmesa, GLuint buffers )
{
__DRIdrawablePrivate *driDrawable = mmesa->driDrawable;
MGASAREAPrivPtr sarea = mmesa->sarea;

/* fprintf(stderr, "%s\n", __FUNCTION__);*/

DRI_VALIDATE_DRAWABLE_INFO(driScreen, driDrawable);
mmesa->dirty_cliprects = 0;

if (mmesa->draw_buffer == MGA_FRONT)
mgaXMesaSetFrontClipRects( mmesa );
else
mgaXMesaSetBackClipRects( mmesa );

#if 0
printMmesaRects(mmesa);
#endif

sarea->req_draw_buffer = mmesa->draw_buffer;

mgaUpdateClipping( mmesa->glCtx );
mgaCalcViewport( mmesa->glCtx );

mmesa->dirty |= MGA_UPLOAD_CLIPRECTS;
}


void mgaDDSetReadBuffer(GLcontext *ctx, GLenum mode )
{
mgaContextPtr mmesa = MGA_CONTEXT(ctx);

if (mode == GL_FRONT_LEFT)
{
mmesa->readOffset = mmesa->mgaScreen->frontOffset;
mmesa->read_buffer = MGA_FRONT;
}
else
{
mmesa->readOffset = mmesa->mgaScreen->backOffset;
mmesa->read_buffer = MGA_BACK;
}
}

void mgaDDSetDrawBuffer(GLcontext *ctx, GLenum mode )
{
mgaContextPtr mmesa = MGA_CONTEXT(ctx);

FLUSH_BATCH( MGA_CONTEXT(ctx) );

/* fprintf( stderr, "%s %d\n", __FUNCTION__, mode);*/

/*
* _DrawDestMask is easier to cope with than <mode>.
*/
switch ( ctx->Color._DrawDestMask ) {
case FRONT_LEFT_BIT:
mmesa->drawOffset = mmesa->mgaScreen->frontOffset;
mmesa->readOffset = mmesa->mgaScreen->frontOffset;
mmesa->setup.dstorg = mmesa->mgaScreen->frontOffset;
mmesa->dirty |= MGA_UPLOAD_CONTEXT;
mmesa->draw_buffer = MGA_FRONT;
mgaXMesaSetFrontClipRects( mmesa );
FALLBACK( ctx, MGA_FALLBACK_DRAW_BUFFER, GL_FALSE );
break;
case BACK_LEFT_BIT:
mmesa->drawOffset = mmesa->mgaScreen->backOffset;
mmesa->readOffset = mmesa->mgaScreen->backOffset;
mmesa->setup.dstorg = mmesa->mgaScreen->backOffset;
mmesa->draw_buffer = MGA_BACK;
mmesa->dirty |= MGA_UPLOAD_CONTEXT;
mgaXMesaSetBackClipRects( mmesa );
FALLBACK( ctx, MGA_FALLBACK_DRAW_BUFFER, GL_FALSE );
break;
default:
FALLBACK( ctx, MGA_FALLBACK_DRAW_BUFFER, GL_TRUE );
break;
}
}


+ 0
- 37
src/mesa/drivers/dri/mga/mgabuffers.h Просмотреть файл

@@ -1,37 +0,0 @@
/* $XFree86: xc/lib/GL/mesa/src/drv/mga/mgabuffers.h,v 1.7 2002/10/30 12:51:35 alanh Exp $ */
/*
* Copyright 2000-2001 VA Linux Systems, Inc.
* All Rights Reserved.
*
* Permission is hereby granted, free of charge, to any person obtaining a
* copy of this software and associated documentation files (the "Software"),
* to deal in the Software without restriction, including without limitation
* on the rights to use, copy, modify, merge, publish, distribute, sub
* license, and/or sell copies of the Software, and to permit persons to whom
* the Software is furnished to do so, subject to the following conditions:
*
* The above copyright notice and this permission notice (including the next
* paragraph) shall be included in all copies or substantial portions of the
* Software.
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
* FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT. IN NO EVENT SHALL
* VA LINUX SYSTEMS AND/OR ITS SUPPLIERS BE LIABLE FOR ANY CLAIM, DAMAGES OR
* OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
* ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
* OTHER DEALINGS IN THE SOFTWARE.
*
* Authors:
* Keith Whitwell <keith@tungstengraphics.com>
*/

#ifndef MGA_BUFFERS_H
#define MGA_BUFFERS_H

void mgaDDSetDrawBuffer(GLcontext *ctx, GLenum mode );
void mgaDDSetReadBuffer(GLcontext *ctx, GLenum mode );

void mgaUpdateRects( mgaContextPtr mmesa, GLuint buffers );

#endif

+ 0
- 256
src/mesa/drivers/dri/mga/mgatexcnv.c Просмотреть файл

@@ -1,256 +0,0 @@
/* $XFree86: xc/lib/GL/mesa/src/drv/mga/mgatexcnv.c,v 1.3 2002/10/30 12:51:36 alanh Exp $ */
/*
* Copyright 2000-2001 VA Linux Systems, Inc.
* All Rights Reserved.
*
* Permission is hereby granted, free of charge, to any person obtaining a
* copy of this software and associated documentation files (the "Software"),
* to deal in the Software without restriction, including without limitation
* on the rights to use, copy, modify, merge, publish, distribute, sub
* license, and/or sell copies of the Software, and to permit persons to whom
* the Software is furnished to do so, subject to the following conditions:
*
* The above copyright notice and this permission notice (including the next
* paragraph) shall be included in all copies or substantial portions of the
* Software.
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
* FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT. IN NO EVENT SHALL
* VA LINUX SYSTEMS AND/OR ITS SUPPLIERS BE LIABLE FOR ANY CLAIM, DAMAGES OR
* OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
* ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
* OTHER DEALINGS IN THE SOFTWARE.
*
* Authors:
* Keith Whitwell <keith@tungstengraphics.com>
*/

#include <stdlib.h>
#include <stdio.h>

#include <GL/gl.h>

#include "mm.h"
#include "mgacontext.h"
#include "mgatex.h"


/*
* mgaConvertTexture
* Converts a mesa format texture to the appropriate hardware format
* Note that sometimes width may be larger than the texture, like 64x1
* for an 8x8 texture. This happens when we have to crutch the pitch
* limits of the mga by uploading a block of texels as a single line.
*/
void mgaConvertTexture( GLuint *destPtr, int texelBytes,
struct gl_texture_image *image,
int x, int y, int width, int height )
{
register int i, j;
GLubyte *src;
int stride;

if (0)
fprintf(stderr, "texture image %p\n", image->Data);

if (image->Data == 0)
return;

/* FIXME: g400 luminance_alpha internal format */
switch (texelBytes) {
case 1:
switch (image->Format) {
case GL_COLOR_INDEX:
case GL_INTENSITY:
case GL_LUMINANCE:
case GL_ALPHA:
src = (GLubyte *)image->Data + ( y * image->Width + x );
stride = (image->Width - width);
for ( i = height ; i ; i-- ) {
for ( j = width >> 2 ; j ; j-- ) {

*destPtr++ = src[0] | ( src[1] << 8 ) | ( src[2] << 16 ) | ( src[3] << 24 );
src += 4;
}
src += stride;
}
break;
default:
goto format_error;
}
break;
case 2:
switch (image->Format) {
case GL_RGB:
src = (GLubyte *)image->Data + ( y * image->Width + x ) * 3;
stride = (image->Width - width) * 3;
for ( i = height ; i ; i-- ) {
for ( j = width >> 1 ; j ; j-- ) {

*destPtr++ = MGAPACKCOLOR565(src[0],src[1],src[2]) |
( MGAPACKCOLOR565(src[3],src[4],src[5]) << 16 );
src += 6;
}
src += stride;
}
break;
case GL_RGBA:
src = (GLubyte *)image->Data + ( y * image->Width + x ) * 4;
stride = (image->Width - width) * 4;
for ( i = height ; i ; i-- ) {
for ( j = width >> 1 ; j ; j-- ) {

*destPtr++ = MGAPACKCOLOR4444(src[0],src[1],src[2],src[3]) |
( MGAPACKCOLOR4444(src[4],src[5],src[6],src[7]) << 16 );
src += 8;
}
src += stride;
}
break;
case GL_LUMINANCE:
src = (GLubyte *)image->Data + ( y * image->Width + x );
stride = (image->Width - width);
for ( i = height ; i ; i-- ) {
for ( j = width >> 1 ; j ; j-- ) {
/* FIXME: should probably use 555 texture to get true grey */
*destPtr++ = MGAPACKCOLOR565(src[0],src[0],src[0]) |
( MGAPACKCOLOR565(src[1],src[1],src[1]) << 16 );
src += 2;
}
src += stride;
}
break;
case GL_INTENSITY:
src = (GLubyte *)image->Data + ( y * image->Width + x );
stride = (image->Width - width);
for ( i = height ; i ; i-- ) {
for ( j = width >> 1 ; j ; j-- ) {

*destPtr++ = MGAPACKCOLOR4444(src[0],src[0],src[0],src[0]) |
( MGAPACKCOLOR4444(src[1],src[1],src[1],src[1]) << 16 );
src += 2;
}
src += stride;
}
break;
case GL_ALPHA:
src = (GLubyte *)image->Data + ( y * image->Width + x );
stride = (image->Width - width);
for ( i = height ; i ; i-- ) {
for ( j = width >> 1 ; j ; j-- ) {

*destPtr++ = MGAPACKCOLOR4444(255,255,255,src[0]) |
( MGAPACKCOLOR4444(255,255,255,src[1]) << 16 );
src += 2;
}
src += stride;
}
break;
case GL_LUMINANCE_ALPHA:
src = (GLubyte *)image->Data + ( y * image->Width + x ) * 2;
stride = (image->Width - width) * 2;
for ( i = height ; i ; i-- ) {
for ( j = width >> 1 ; j ; j-- ) {

*destPtr++ = MGAPACKCOLOR4444(src[0],src[0],src[0],src[1]) |
( MGAPACKCOLOR4444(src[2],src[2],src[2],src[3]) << 16 );
src += 4;
}
src += stride;
}
break;
default:
goto format_error;
}
break;
case 4:
switch (image->Format) {
case GL_RGB:
src = (GLubyte *)image->Data + ( y * image->Width + x ) * 3;
stride = (image->Width - width) * 3;
for ( i = height ; i ; i-- ) {
for ( j = width ; j ; j-- ) {

*destPtr++ = MGAPACKCOLOR8888(src[0],src[1],src[2], 255);
src += 3;
}
src += stride;
}
break;
case GL_RGBA:
src = (GLubyte *)image->Data + ( y * image->Width + x ) * 4;
stride = (image->Width - width) * 4;
for ( i = height ; i ; i-- ) {
for ( j = width ; j ; j-- ) {

*destPtr++ = MGAPACKCOLOR8888(src[0],src[1],src[2],src[3]);
src += 4;
}
src += stride;
}
break;
case GL_LUMINANCE:
src = (GLubyte *)image->Data + ( y * image->Width + x );
stride = (image->Width - width);
for ( i = height ; i ; i-- ) {
for ( j = width ; j ; j-- ) {

*destPtr++ = MGAPACKCOLOR8888(src[0],src[0],src[0], 255);
src += 1;
}
src += stride;
}
break;
case GL_INTENSITY:
src = (GLubyte *)image->Data + ( y * image->Width + x );
stride = (image->Width - width);
for ( i = height ; i ; i-- ) {
for ( j = width ; j ; j-- ) {

*destPtr++ = MGAPACKCOLOR8888(src[0],src[0],src[0],src[0]);
src += 1;
}
src += stride;
}
break;
case GL_ALPHA:
src = (GLubyte *)image->Data + ( y * image->Width + x );
stride = (image->Width - width);
for ( i = height ; i ; i-- ) {
for ( j = width ; j ; j-- ) {

*destPtr++ = MGAPACKCOLOR8888(255,255,255,src[0]);
src += 1;
}
src += stride;
}
break;
case GL_LUMINANCE_ALPHA:
src = (GLubyte *)image->Data + ( y * image->Width + x ) * 2;
stride = (image->Width - width) * 2;
for ( i = height ; i ; i-- ) {
for ( j = width ; j ; j-- ) {

*destPtr++ = MGAPACKCOLOR8888(src[0],src[0],
src[0],src[1]);
src += 2;
}
src += stride;
}
break;
default:
goto format_error;
}
break;
default:
goto format_error;
}

return;

format_error:

fprintf(stderr, "Unsupported texelBytes %i, image->Format %i\n",
(int)texelBytes, (int)image->Format );
}

Редактирование Предпросмотр
Загрузка…
Отмена
Сохранить