KonstantinSeurer
/
mesa
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote branch 'origin/7.8'

This commit is contained in:
Michel Dänzer 2010-03-11 12:14:05 +01:00
parent aa311ae616 54af54277a
commit fc1dd5ce1d
6 changed files with 58 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/gallium/state_trackers/xorg/xorg_crtc.c
View File

@ -39,6 +39,7 @@
#include <xf86.h>
#include <xf86i2c.h>
#include <xf86Crtc.h>
#include <cursorstr.h>
#include "xorg_tracker.h"
#include "xf86Modes.h"

27
src/mesa/drivers/windows/gdi/wmesa.c
View File

@ -247,16 +247,6 @@ static void wmesa_flush(GLcontext *ctx)
* span writing interface, which is very slow for a clear operation.
*/
/*
* Set the color index used to clear the color buffer.
*/
static void clear_index(GLcontext *ctx, GLuint index)
{
WMesaContext pwc = wmesa_context(ctx);
/* Note that indexed mode is not supported yet */
pwc->clearColorRef = RGB(0,0,0);
}
/*
* Set the color used to clear the color buffer.
*/
@ -482,7 +472,7 @@ static void write_rgba_span_front(const GLcontext *ctx,
};
} BGRA;
BGRA *bgra, c;
int i;
GLuint i;
if (n < 16) { // the value 16 is just guessed
y=FLIP(y);
@ -827,9 +817,9 @@ static void read_rgba_span_32(const GLcontext *ctx,
lpdw = ((LPDWORD)(pwfb->pbPixels + pwfb->ScanWidth * y)) + x;
for (i=0; i<n; i++) {
pixel = lpdw[i];
rgba[i][RCOMP] = (pixel & 0x00ff0000) >> 16;
rgba[i][GCOMP] = (pixel & 0x0000ff00) >> 8;
rgba[i][BCOMP] = (pixel & 0x000000ff);
rgba[i][RCOMP] = (GLubyte)((pixel & 0x00ff0000) >> 16);
rgba[i][GCOMP] = (GLubyte)((pixel & 0x0000ff00) >> 8);
rgba[i][BCOMP] = (GLubyte)(pixel & 0x000000ff);
rgba[i][ACOMP] = 255;
}
}
@ -851,9 +841,9 @@ static void read_rgba_pixels_32(const GLcontext *ctx,
GLint y2 = FLIP(y[i]);
lpdw = ((LPDWORD)(pwfb->pbPixels + pwfb->ScanWidth * y2)) + x[i];
pixel = *lpdw;
rgba[i][RCOMP] = (pixel & 0x00ff0000) >> 16;
rgba[i][GCOMP] = (pixel & 0x0000ff00) >> 8;
rgba[i][BCOMP] = (pixel & 0x000000ff);
rgba[i][RCOMP] = (GLubyte)((pixel & 0x00ff0000) >> 16);
rgba[i][GCOMP] = (GLubyte)((pixel & 0x0000ff00) >> 8);
rgba[i][BCOMP] = (GLubyte)(pixel & 0x000000ff);
rgba[i][ACOMP] = 255;
}
}
@ -1271,7 +1261,7 @@ wmesa_renderbuffer_storage(GLcontext *ctx,
* on if we're drawing to the front or back color buffer.
*/
void wmesa_set_renderbuffer_funcs(struct gl_renderbuffer *rb, int pixelformat,
BYTE cColorBits, int double_buffer)
int cColorBits, int double_buffer)
{
if (double_buffer) {
/* back buffer */
@ -1483,7 +1473,6 @@ WMesaContext WMesaCreateContext(HDC hDC,
functions.GetBufferSize = wmesa_get_buffer_size;
functions.Flush = wmesa_flush;
functions.Clear = clear;
functions.ClearIndex = clear_index;
functions.ClearColor = clear_color;
functions.ResizeBuffers = wmesa_resize_buffers;
functions.Viewport = wmesa_viewport;

2
src/mesa/drivers/windows/gdi/wmesadef.h
View File

@ -27,7 +27,7 @@ struct wmesa_framebuffer
HDC hDC;
int pixelformat;
GLuint ScanWidth;
BYTE cColorBits;
int cColorBits;
/* back buffer DIB fields */
HDC dib_hDC;
BITMAPINFO bmi;

2
src/mesa/swrast/s_span.c
View File

@ -60,6 +60,7 @@
void
_swrast_span_default_attribs(GLcontext *ctx, SWspan *span)
{
GLchan r, g, b, a;
/* Z*/
{
const GLfloat depthMax = ctx->DrawBuffer->_DepthMaxF;
@ -80,7 +81,6 @@ _swrast_span_default_attribs(GLcontext *ctx, SWspan *span)
span->attrStepY[FRAG_ATTRIB_WPOS][3] = 0.0;
/* primary color, or color index */
GLchan r, g, b, a;
UNCLAMPED_FLOAT_TO_CHAN(r, ctx->Current.RasterColor[0]);
UNCLAMPED_FLOAT_TO_CHAN(g, ctx->Current.RasterColor[1]);
UNCLAMPED_FLOAT_TO_CHAN(b, ctx->Current.RasterColor[2]);

30
windows/VC8/mesa/.gitignore vendored Normal file
View File

@ -0,0 +1,30 @@
debug/
debug static crt/
release/
release static crt/
gdi/Debug/
gdi/Debug Static CRT/
gdi/Release/
gdi/Release Static CRT/
gdi/*.user
glsl_apps_compile/Debug
glsl_apps_compile/Release
glsl_apps_compile/*.user
glu/Debug/
glu/Debug Static CRT/
glu/Release/
glu/Release Static CRT/
glu/*.user
mesa.ncb
mesa.suo
mesa/Debug/
mesa/Debug Static CRT/
mesa/Release/
mesa/Release Static CRT/
mesa/*.user
osmesa/Debug/
osmesa/Debug Static CRT/
osmesa/Release/
osmesa/Release Static CRT/
osmesa/*.user

17
windows/VC8/progs/.gitignore vendored Normal file
View File

@ -0,0 +1,17 @@
debug/
debug static crt/
release/
release static crt/
demos/Debug/
demos/Debug Static CRT/
demos/Release/
demos/Release Static CRT/
demos/*.user
glut/Debug/
glut/Debug Static CRT/
glut/Release/
glut/Release Static CRT/
glut/*.user
progs.ncb
progs.suo