From 27d260b41038e0c19c8f24b8bdb2c004c1eb7aa2 Mon Sep 17 00:00:00 2001 From: Chia-I Wu Date: Wed, 24 Feb 2010 11:20:14 +0800 Subject: glapi: Move src/mesa/main/dispatch.c to glapi and rename. main/dispatch.c is a glapi source file. It is part of GLAPI_SOURCES in sources.mak and part of glapi_sources in SConscript. This commit moves it to glapi/ and renames it to glapi_dispatch.c. --- windows/VC8/mesa/mesa/mesa.vcproj | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'windows/VC8/mesa') diff --git a/windows/VC8/mesa/mesa/mesa.vcproj b/windows/VC8/mesa/mesa/mesa.vcproj index 15ad229328..8795746916 100644 --- a/windows/VC8/mesa/mesa/mesa.vcproj +++ b/windows/VC8/mesa/mesa/mesa.vcproj @@ -422,10 +422,6 @@ RelativePath="..\..\..\..\src\mesa\main\depthstencil.c" > - - @@ -494,6 +490,10 @@ RelativePath="..\..\..\..\src\mesa\glapi\glapi.c" > + + -- cgit v1.2.3 From 7439f39016ca5880d52518aa9fdf5f17d5446ea6 Mon Sep 17 00:00:00 2001 From: Karl Schultz Date: Wed, 10 Mar 2010 14:27:34 -0700 Subject: windows: Quiet warning by not defining YY_NO_UNISTD_H. --- windows/VC8/mesa/mesa/mesa.vcproj | 64 +++++++++++++++++++-------------------- 1 file changed, 32 insertions(+), 32 deletions(-) (limited to 'windows/VC8/mesa') diff --git a/windows/VC8/mesa/mesa/mesa.vcproj b/windows/VC8/mesa/mesa/mesa.vcproj index 8795746916..f7c3c73446 100644 --- a/windows/VC8/mesa/mesa/mesa.vcproj +++ b/windows/VC8/mesa/mesa/mesa.vcproj @@ -538,7 +538,7 @@ > @@ -1844,7 +1844,7 @@ @@ -1855,7 +1855,7 @@ @@ -1866,7 +1866,7 @@ @@ -1877,7 +1877,7 @@ @@ -1896,7 +1896,7 @@ @@ -1907,7 +1907,7 @@ @@ -1918,7 +1918,7 @@ @@ -1929,7 +1929,7 @@ @@ -1944,7 +1944,7 @@ @@ -1955,7 +1955,7 @@ @@ -1966,7 +1966,7 @@ @@ -1977,7 +1977,7 @@ @@ -1996,7 +1996,7 @@ @@ -2007,7 +2007,7 @@ @@ -2018,7 +2018,7 @@ @@ -2029,7 +2029,7 @@ @@ -2064,7 +2064,7 @@ @@ -2075,7 +2075,7 @@ @@ -2086,7 +2086,7 @@ @@ -2097,7 +2097,7 @@ @@ -2116,7 +2116,7 @@ @@ -2127,7 +2127,7 @@ @@ -2138,7 +2138,7 @@ @@ -2149,7 +2149,7 @@ @@ -2208,7 +2208,7 @@ @@ -2219,7 +2219,7 @@ @@ -2230,7 +2230,7 @@ @@ -2241,7 +2241,7 @@ -- cgit v1.2.3 From 60121c41ce9ee50ff8d8476d4eb04867adf9b8c5 Mon Sep 17 00:00:00 2001 From: Karl Schultz Date: Wed, 10 Mar 2010 15:58:10 -0700 Subject: windows: fix compilation errors and warnings --- src/mesa/drivers/windows/gdi/wmesa.c | 27 ++++++++------------------- src/mesa/drivers/windows/gdi/wmesadef.h | 2 +- src/mesa/swrast/s_span.c | 2 +- windows/VC8/mesa/.gitignore | 30 ++++++++++++++++++++++++++++++ windows/VC8/progs/.gitignore | 17 +++++++++++++++++ 5 files changed, 57 insertions(+), 21 deletions(-) create mode 100644 windows/VC8/mesa/.gitignore create mode 100644 windows/VC8/progs/.gitignore (limited to 'windows/VC8/mesa') diff --git a/src/mesa/drivers/windows/gdi/wmesa.c b/src/mesa/drivers/windows/gdi/wmesa.c index 91ddc3615a..22b0c46b4f 100644 --- a/src/mesa/drivers/windows/gdi/wmesa.c +++ b/src/mesa/drivers/windows/gdi/wmesa.c @@ -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> 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; diff --git a/src/mesa/drivers/windows/gdi/wmesadef.h b/src/mesa/drivers/windows/gdi/wmesadef.h index 83a42e6082..1c0e245111 100644 --- a/src/mesa/drivers/windows/gdi/wmesadef.h +++ b/src/mesa/drivers/windows/gdi/wmesadef.h @@ -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; diff --git a/src/mesa/swrast/s_span.c b/src/mesa/swrast/s_span.c index 29f070686f..687c8eb0bf 100644 --- a/src/mesa/swrast/s_span.c +++ b/src/mesa/swrast/s_span.c @@ -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]); diff --git a/windows/VC8/mesa/.gitignore b/windows/VC8/mesa/.gitignore new file mode 100644 index 0000000000..d89aab109b --- /dev/null +++ b/windows/VC8/mesa/.gitignore @@ -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 + diff --git a/windows/VC8/progs/.gitignore b/windows/VC8/progs/.gitignore new file mode 100644 index 0000000000..b1d3677c1b --- /dev/null +++ b/windows/VC8/progs/.gitignore @@ -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 + -- cgit v1.2.3 From 560d3750067e5c0c106c5ec4ebf287ca6793731b Mon Sep 17 00:00:00 2001 From: Karl Schultz Date: Thu, 11 Mar 2010 09:17:05 -0700 Subject: windows: Add new file to project file. --- windows/VC8/mesa/mesa/mesa.vcproj | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'windows/VC8/mesa') diff --git a/windows/VC8/mesa/mesa/mesa.vcproj b/windows/VC8/mesa/mesa/mesa.vcproj index f7c3c73446..5a5b93a779 100644 --- a/windows/VC8/mesa/mesa/mesa.vcproj +++ b/windows/VC8/mesa/mesa/mesa.vcproj @@ -494,6 +494,10 @@ RelativePath="..\..\..\..\src\mesa\glapi\glapi_dispatch.c" > + + -- cgit v1.2.3