projects
/
mesa.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Drop GLcontext typedef and use struct gl_context instead
[mesa.git]
/
src
/
mesa
/
drivers
/
dri
/
tdfx
/
tdfx_pixels.c
diff --git
a/src/mesa/drivers/dri/tdfx/tdfx_pixels.c
b/src/mesa/drivers/dri/tdfx/tdfx_pixels.c
index 9ab9c05f2bd083e49d900e4dcd0a5c3fd0a9c0c6..bbbd0d5740f26701e3ebc7e26813f601a6f83b2b 100644
(file)
--- a/
src/mesa/drivers/dri/tdfx/tdfx_pixels.c
+++ b/
src/mesa/drivers/dri/tdfx/tdfx_pixels.c
@@
-38,7
+38,6
@@
#include "tdfx_context.h"
#include "tdfx_dd.h"
#include "tdfx_lock.h"
#include "tdfx_context.h"
#include "tdfx_dd.h"
#include "tdfx_lock.h"
-#include "tdfx_vb.h"
#include "tdfx_pixels.h"
#include "tdfx_render.h"
#include "tdfx_pixels.h"
#include "tdfx_render.h"
@@
-154,7
+153,7
@@
inClipRects_Region(tdfxContextPtr fxMesa, int x, int y, int width, int height)
#if 0
GLboolean
#if 0
GLboolean
-tdfx_bitmap_R5G6B5(
GL
context * ctx, GLint px, GLint py,
+tdfx_bitmap_R5G6B5(
struct gl_
context * ctx, GLint px, GLint py,
GLsizei width, GLsizei height,
const struct gl_pixelstore_attrib *unpack,
const GLubyte * bitmap)
GLsizei width, GLsizei height,
const struct gl_pixelstore_attrib *unpack,
const GLubyte * bitmap)
@@
-318,7
+317,7
@@
tdfx_bitmap_R5G6B5(GLcontext * ctx, GLint px, GLint py,
#if 0
GLboolean
#if 0
GLboolean
-tdfx_bitmap_R8G8B8A8(
GL
context * ctx, GLint px, GLint py,
+tdfx_bitmap_R8G8B8A8(
struct gl_
context * ctx, GLint px, GLint py,
GLsizei width, GLsizei height,
const struct gl_pixelstore_attrib *unpack,
const GLubyte * bitmap)
GLsizei width, GLsizei height,
const struct gl_pixelstore_attrib *unpack,
const GLubyte * bitmap)
@@
-476,7
+475,7
@@
tdfx_bitmap_R8G8B8A8(GLcontext * ctx, GLint px, GLint py,
#endif
void
#endif
void
-tdfx_readpixels_R5G6B5(
GL
context * ctx, GLint x, GLint y,
+tdfx_readpixels_R5G6B5(
struct gl_
context * ctx, GLint x, GLint y,
GLsizei width, GLsizei height,
GLenum format, GLenum type,
const struct gl_pixelstore_attrib *packing,
GLsizei width, GLsizei height,
GLenum format, GLenum type,
const struct gl_pixelstore_attrib *packing,
@@
-495,7
+494,7
@@
tdfx_readpixels_R5G6B5(GLcontext * ctx, GLint x, GLint y,
{
tdfxContextPtr fxMesa = TDFX_CONTEXT(ctx);
GrLfbInfo_t info;
{
tdfxContextPtr fxMesa = TDFX_CONTEXT(ctx);
GrLfbInfo_t info;
- __DRIdrawable
Private
*const readable = fxMesa->driReadable;
+ __DRIdrawable *const readable = fxMesa->driReadable;
const GLint winX = readable->x;
const GLint winY = readable->y + readable->h - 1;
const GLint scrX = winX + x;
const GLint winX = readable->x;
const GLint winY = readable->y + readable->h - 1;
const GLint scrX = winX + x;
@@
-520,7
+519,7
@@
tdfx_readpixels_R5G6B5(GLcontext * ctx, GLint x, GLint y,
const GLint widthInBytes = width * 2;
GLint row;
for (row = 0; row < height; row++) {
const GLint widthInBytes = width * 2;
GLint row;
for (row = 0; row < height; row++) {
-
MEMCPY
(dst, src, widthInBytes);
+
memcpy
(dst, src, widthInBytes);
dst += dstStride;
src -= srcStride;
}
dst += dstStride;
src -= srcStride;
}
@@
-533,7
+532,7
@@
tdfx_readpixels_R5G6B5(GLcontext * ctx, GLint x, GLint y,
}
void
}
void
-tdfx_readpixels_R8G8B8A8(
GL
context * ctx, GLint x, GLint y,
+tdfx_readpixels_R8G8B8A8(
struct gl_
context * ctx, GLint x, GLint y,
GLsizei width, GLsizei height,
GLenum format, GLenum type,
const struct gl_pixelstore_attrib *packing,
GLsizei width, GLsizei height,
GLenum format, GLenum type,
const struct gl_pixelstore_attrib *packing,
@@
-553,7
+552,7
@@
tdfx_readpixels_R8G8B8A8(GLcontext * ctx, GLint x, GLint y,
{
tdfxContextPtr fxMesa = TDFX_CONTEXT(ctx);
GrLfbInfo_t info;
{
tdfxContextPtr fxMesa = TDFX_CONTEXT(ctx);
GrLfbInfo_t info;
- __DRIdrawable
Private
*const readable = fxMesa->driReadable;
+ __DRIdrawable *const readable = fxMesa->driReadable;
const GLint winX = readable->x;
const GLint winY = readable->y + readable->h - 1;
const GLint scrX = winX + x;
const GLint winX = readable->x;
const GLint winY = readable->y + readable->h - 1;
const GLint scrX = winX + x;
@@
-579,7
+578,7
@@
tdfx_readpixels_R8G8B8A8(GLcontext * ctx, GLint x, GLint y,
{
GLint row;
for (row = 0; row < height; row++) {
{
GLint row;
for (row = 0; row < height; row++) {
-
MEMCPY
(dst, src, widthInBytes);
+
memcpy
(dst, src, widthInBytes);
dst += dstStride;
src -= srcStride;
}
dst += dstStride;
src -= srcStride;
}
@@
-592,7
+591,7
@@
tdfx_readpixels_R8G8B8A8(GLcontext * ctx, GLint x, GLint y,
}
void
}
void
-tdfx_drawpixels_R8G8B8A8(
GL
context * ctx, GLint x, GLint y,
+tdfx_drawpixels_R8G8B8A8(
struct gl_
context * ctx, GLint x, GLint y,
GLsizei width, GLsizei height,
GLenum format, GLenum type,
const struct gl_pixelstore_attrib *unpack,
GLsizei width, GLsizei height,
GLenum format, GLenum type,
const struct gl_pixelstore_attrib *unpack,
@@
-610,11
+609,11
@@
tdfx_drawpixels_R8G8B8A8(GLcontext * ctx, GLint x, GLint y,
ctx->Depth.Test ||
ctx->Fog.Enabled ||
ctx->Scissor.Enabled ||
ctx->Depth.Test ||
ctx->Fog.Enabled ||
ctx->Scissor.Enabled ||
- ctx->Stencil.Enabled ||
- !ctx->Color.ColorMask[0] ||
- !ctx->Color.ColorMask[1] ||
- !ctx->Color.ColorMask[2] ||
- !ctx->Color.ColorMask[3] ||
+ ctx->Stencil.
_
Enabled ||
+ !ctx->Color.ColorMask[0]
[0]
||
+ !ctx->Color.ColorMask[
0][
1] ||
+ !ctx->Color.ColorMask[
0][
2] ||
+ !ctx->Color.ColorMask[
0][
3] ||
ctx->Color.ColorLogicOpEnabled ||
ctx->Texture._EnabledUnits ||
fxMesa->Fallback)
ctx->Color.ColorLogicOpEnabled ||
ctx->Texture._EnabledUnits ||
fxMesa->Fallback)
@@
-673,7
+672,7
@@
tdfx_drawpixels_R8G8B8A8(GLcontext * ctx, GLint x, GLint y,
(format == GL_BGRA && type == GL_UNSIGNED_BYTE)) {
GLint row;
for (row = 0; row < height; row++) {
(format == GL_BGRA && type == GL_UNSIGNED_BYTE)) {
GLint row;
for (row = 0; row < height; row++) {
-
MEMCPY
(dst, src, widthInBytes);
+
memcpy
(dst, src, widthInBytes);
dst -= dstStride;
src += srcStride;
}
dst -= dstStride;
src += srcStride;
}