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

Merge branch 'mesa_7_5_branch' 

Conflicts:

	Makefile
	configs/default
	docs/relnotes.html
	src/mesa/main/version.h
This commit is contained in:
Brian Paul 2009-07-28 08:58:25 -06:00
parent 94726bc69e bc60b88411
commit d2f6d6ce49
13 changed files with 148 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Makefile
View File

@ -388,7 +388,17 @@ GLW_FILES = \
$(DIRECTORY)/src/glw/glw.pc.in \
$(DIRECTORY)/src/glw/depend
GLEW_FILES = \
$(DIRECTORY)/include/GL/glew.h \
$(DIRECTORY)/include/GL/glxew.h \
$(DIRECTORY)/include/GL/wglew.h \
$(DIRECTORY)/src/glew/*.c \
$(DIRECTORY)/src/glew/Makefile \
$(DIRECTORY)/src/glew/SConscript \
$(DIRECTORY)/src/glew/LICENSE.txt
DEMO_FILES = \
$(GLEW_FILES) \
$(DIRECTORY)/progs/beos/*.cpp \
$(DIRECTORY)/progs/beos/Makefile \
$(DIRECTORY)/progs/images/*.rgb \

54
docs/relnotes-7.5.1.html Normal file
View File

@ -0,0 +1,54 @@
<HTML>
<TITLE>Mesa Release Notes</TITLE>
<head><link rel="stylesheet" type="text/css" href="mesa.css"></head>
<BODY>
<body bgcolor="#eeeeee">
<H1>Mesa 7.5.1 Release Notes / (date TBD)</H1>
<p>
Mesa 7.5.1 is a bug-fix release fixing issues found since the 7.5 release.
</p>
<p>
The main new feature of Mesa 7.5.x is the
<a href="http://wiki.freedesktop.org/wiki/Software/gallium"
target="_parent">Gallium3D</a> infrastructure.
</p>
<p>
Mesa 7.5.1 implements the OpenGL 2.1 API, but the version reported by
glGetString(GL_VERSION) depends on the particular driver being used.
Some drivers don't support all the features required in OpenGL 2.1.
</p>
<p>
See the <a href="install.html">Compiling/Installing page</a> for prerequisites
for DRI hardware acceleration.
</p>
<h2>MD5 checksums</h2>
<pre>
tbd
</pre>
<h2>New features</h2>
<ul>
</ul>
<h2>Bug fixes</h2>
<ul>
<li>Added missing GLEW library to MesaDemos tarballs.
</ul>
<h2>Changes</h2>
<ul>
</ul>
</body>
</html>

10
docs/relnotes-7.5.html
View File

@ -40,7 +40,15 @@ If you're especially concerned with stability you should probably look for
<h2>MD5 checksums</h2>
<pre>
tbd
553fd956e544727f30fbe249619b6286 MesaLib-7.5.tar.gz
459f332551f6ebb86f384d21dd15e1f0 MesaLib-7.5.tar.bz2
8c02c0e17a9025250d20424ae32f5163 MesaLib-7.5.zip
a188da2886fa5496ea0c2cda602b2eeb MesaDemos-7.5.tar.gz
398ee8801814a00e47f6c2314e3dfddc MesaDemos-7.5.tar.bz2
15a0c8ae013c54335a26335e1a98d609 MesaDemos-7.5.zip
81010147def5a644ba14f9bbb7a49a2a MesaGLUT-7.5.tar.gz
baa7a1e850b6e39bae58868fd0684004 MesaGLUT-7.5.tar.bz2
265228418e4423fa328f2f5b7970cf08 MesaGLUT-7.5.zip
</pre>

1
docs/relnotes.html
View File

@ -14,6 +14,7 @@ The release notes summarize what's new or changed in each Mesa release.
<UL>
<LI><A HREF="relnotes-7.6.html">7.6 release notes</A>
<LI><A HREF="relnotes-7.5.1.html">7.5.1 release notes</A>
<LI><A HREF="relnotes-7.5.html">7.5 release notes</A>
<LI><A HREF="relnotes-7.4.4.html">7.4.4 release notes</A>
<LI><A HREF="relnotes-7.4.3.html">7.4.3 release notes</A>

15
progs/trivial/.gitignore vendored
View File

@ -5,10 +5,17 @@ clear-random
clear-repeat
clear-scissor
clear-undefined
createwin
dlist-begin-call-end
dlist-dangling
dlist-degenerate
dlist-edgeflag
dlist-edgeflag-dangling
dlist-flat-tri
dlist-mat-tri
dlist-recursive-call
dlist-tri-flat-tri
dlist-tri-mat-tri
draw2arrays
drawarrays
drawelements
@ -31,6 +38,7 @@ lineloop
lineloop-clip
lineloop-elts
linestrip
linestrip-clip
linestrip-flat-stipple
linestrip-stipple
linestrip-stipple-wide
@ -71,8 +79,10 @@ quadstrip-cont
quadstrip-flat
readtex.c
readtex.h
readpixels
tri
tri-alpha
tri-alpha-tex
tri-array-interleaved
tri-blend
tri-blend-color
@ -80,6 +90,7 @@ tri-blend-max
tri-blend-min
tri-blend-revsub
tri-blend-sub
tri-clear
tri-clip
tri-cull
tri-cull-both
@ -94,6 +105,7 @@ tri-fog
tri-fp
tri-fp-const-imm
tri-lit
tri-lit-material
tri-logicop-none
tri-logicop-xor
tri-mask-tri
@ -102,6 +114,7 @@ tri-orig
tri-query
tri-repeat
tri-scissor-tri
tri-square
tri-stencil
tri-stipple
tri-tex
@ -111,6 +124,7 @@ tri-unfilled
tri-unfilled-clip
tri-unfilled-edgeflag
tri-unfilled-fog
tri-unfilled-point
tri-unfilled-smooth
tri-unfilled-tri
tri-unfilled-tri-lit
@ -119,6 +133,7 @@ tri-unfilled-userclip-stip
tri-userclip
tri-viewport
tri-z
tri-z-9
tri-z-eq
trifan
trifan-flat

8
progs/trivial/Makefile
View File

@ -18,6 +18,7 @@ SOURCES = \
clear-repeat.c \
clear-random.c \
clear.c \
createwin.c \
dlist-dangling.c \
dlist-flat-tri.c \
dlist-mat-tri.c \
@ -48,6 +49,7 @@ SOURCES = \
lineloop-clip.c \
lineloop-elts.c \
lineloop.c \
linestrip-clip.c \
linestrip-flat-stipple.c \
linestrip-stipple-wide.c \
linestrip-stipple.c \
@ -87,7 +89,9 @@ SOURCES = \
quadstrip-cont.c \
quadstrip-flat.c \
quadstrip.c \
readpixels.c \
tri-alpha.c \
tri-alpha-tex.c \
tri-array-interleaved.c \
tri-blend-color.c \
tri-blend-max.c \
@ -95,6 +99,7 @@ SOURCES = \
tri-blend-revsub.c \
tri-blend-sub.c \
tri-blend.c \
tri-clear.c \
tri-clip.c \
tri-cull-both.c \
tri-cull.c \
@ -117,6 +122,7 @@ SOURCES = \
tri-query.c \
tri-repeat.c \
tri-scissor-tri.c \
tri-square.c \
tri-stencil.c \
tri-stipple.c \
tri-multitex-vbo.c \
@ -126,6 +132,7 @@ SOURCES = \
tri-unfilled-fog.c \
tri-unfilled-edgeflag.c \
tri-unfilled-clip.c \
tri-unfilled-point.c \
tri-unfilled-smooth.c \
tri-unfilled-tri.c \
tri-unfilled-tri-lit.c \
@ -134,6 +141,7 @@ SOURCES = \
tri-unfilled.c \
tri-userclip.c \
tri-viewport.c \
tri-z-9.c \
tri-z-eq.c \
tri-z.c \
tri.c \

2
src/gallium/auxiliary/util/u_tile.c
View File

@ -153,7 +153,7 @@ a8r8g8b8_put_tile_rgba(unsigned *dst,
}
/*** PIPE_FORMAT_A8R8G8B8_UNORM ***/
/*** PIPE_FORMAT_X8R8G8B8_UNORM ***/
static void
x8r8g8b8_get_tile_rgba(const unsigned *src,

6
src/mesa/drivers/dri/intel/intel_screen.c
View File

@ -628,10 +628,10 @@ intel_init_bufmgr(intelScreenPrivate *intelScreen)
/* Otherwise, use the classic buffer manager. */
if (intelScreen->bufmgr == NULL) {
if (gem_disable) {
fprintf(stderr, "GEM disabled. Using classic.\n");
_mesa_warning(NULL, "GEM disabled. Using classic.");
} else {
fprintf(stderr, "Failed to initialize GEM. "
"Falling back to classic.\n");
_mesa_warning(NULL,
"Failed to initialize GEM. Falling back to classic.");
}
if (intelScreen->tex.size == 0) {

1
src/mesa/drivers/windows/gdi/mesa.def
View File

@ -902,7 +902,6 @@ EXPORTS
_mesa_generate_mipmap
_mesa_get_compressed_teximage
_mesa_get_current_context
_mesa_get_program_register
_mesa_get_teximage
_mesa_init_driver_functions
_mesa_init_glsl_driver_functions

8
src/mesa/main/compiler.h
View File

@ -110,10 +110,8 @@ extern "C" {
#if defined(_WIN32) && !defined(__WIN32__) && !defined(__CYGWIN__) && !defined(BUILD_FOR_SNAP)
# define __WIN32__
# define finite _finite
#endif
#if defined(__WATCOMC__)
#elif defined(__WATCOMC__)
# define finite _finite
# pragma disable_message(201) /* Disable unreachable code warnings */
#endif
@ -135,6 +133,10 @@ extern "C" {
# endif
# endif
#endif
#if defined(__WATCOMC__)
# pragma disable_message(201) /* Disable unreachable code warnings */
#endif
/**

3
src/mesa/state_tracker/st_cb_texture.c
View File

@ -1047,7 +1047,8 @@ st_TexSubimage(GLcontext *ctx, GLint dims, GLenum target, GLint level,
_mesa_image_image_stride(packing, width, height, format, type);
GLint i;
const GLubyte *src;
enum pipe_transfer_usage transfer_usage;
/* init to silence warning only: */
enum pipe_transfer_usage transfer_usage = PIPE_TRANSFER_WRITE;
DBG("%s target %s level %d offset %d,%d %dx%d\n", __FUNCTION__,
_mesa_lookup_enum_by_nr(target),

52
windows/VC8/mesa/mesa/mesa.vcproj
View File

@ -52,6 +52,7 @@
WarningLevel="3"
SuppressStartupBanner="true"
CompileAs="0"
ForcedIncludeFiles="../../../../src/mesa/main/compiler.h"
/>
<Tool
Name="VCManagedResourceCompilerTool"
@ -122,6 +123,7 @@
SuppressStartupBanner="true"
DebugInformationFormat="3"
CompileAs="0"
ForcedIncludeFiles="../../../../src/mesa/main/compiler.h"
/>
<Tool
Name="VCManagedResourceCompilerTool"
@ -192,6 +194,7 @@
SuppressStartupBanner="true"
DebugInformationFormat="3"
CompileAs="0"
ForcedIncludeFiles="../../../../src/mesa/main/compiler.h"
/>
<Tool
Name="VCManagedResourceCompilerTool"
@ -262,6 +265,7 @@
WarningLevel="3"
SuppressStartupBanner="true"
CompileAs="0"
ForcedIncludeFiles="../../../../src/mesa/main/compiler.h"
/>
<Tool
Name="VCManagedResourceCompilerTool"
@ -378,6 +382,10 @@
RelativePath="..\..\..\..\src\mesa\main\convolve.c"
>
</File>
<File
RelativePath="..\..\..\..\src\mesa\main\cpuinfo.c"
>
</File>
<File
RelativePath="..\..\..\..\src\mesa\main\debug.c"
>
@ -650,10 +658,6 @@
RelativePath="..\..\..\..\src\mesa\shader\prog_cache.c"
>
</File>
<File
RelativePath="..\..\..\..\src\mesa\shader\prog_debug.c"
>
</File>
<File
RelativePath="..\..\..\..\src\mesa\shader\prog_execute.c"
>
@ -666,6 +670,10 @@
RelativePath="..\..\..\..\src\mesa\shader\prog_noise.c"
>
</File>
<File
RelativePath="..\..\..\..\src\mesa\shader\prog_optimize.c"
>
</File>
<File
RelativePath="..\..\..\..\src\mesa\shader\prog_parameter.c"
>
@ -1034,6 +1042,10 @@
RelativePath="..\..\..\..\src\mesa\main\texgen.c"
>
</File>
<File
RelativePath="..\..\..\..\src\mesa\main\texgetimage.c"
>
</File>
<File
RelativePath="..\..\..\..\src\mesa\main\teximage.c"
>
@ -1062,10 +1074,6 @@
RelativePath="..\..\..\..\src\mesa\main\varray.c"
>
</File>
<File
RelativePath="..\..\..\..\src\mesa\main\viewport.c"
>
</File>
<File
RelativePath="..\..\..\..\src\mesa\vbo\vbo_context.c"
>
@ -1122,6 +1130,10 @@
RelativePath="..\..\..\..\src\mesa\vbo\vbo_split_inplace.c"
>
</File>
<File
RelativePath="..\..\..\..\src\mesa\main\viewport.c"
>
</File>
<File
RelativePath="..\..\..\..\src\mesa\main\vsnprintf.c"
>
@ -1263,6 +1275,10 @@
RelativePath="..\..\..\..\src\mesa\main\convolve.h"
>
</File>
<File
RelativePath="..\..\..\..\src\mesa\main\cpuinfo.h"
>
</File>
<File
RelativePath="..\..\..\..\src\mesa\main\dd.h"
>
@ -1519,10 +1535,6 @@
RelativePath="..\..\..\..\src\mesa\main\polygon.h"
>
</File>
<File
RelativePath="..\..\..\..\src\mesa\shader\prog_debug.h"
>
</File>
<File
RelativePath="..\..\..\..\src\mesa\shader\prog_execute.h"
>
@ -1535,6 +1547,10 @@
RelativePath="..\..\..\..\src\mesa\shader\prog_noise.h"
>
</File>
<File
RelativePath="..\..\..\..\src\mesa\shader\prog_optimize.h"
>
</File>
<File
RelativePath="..\..\..\..\src\mesa\shader\prog_parameter.h"
>
@ -1879,6 +1895,10 @@
RelativePath="..\..\..\..\src\mesa\main\texgen.h"
>
</File>
<File
RelativePath="..\..\..\..\src\mesa\main\texgetimage.h"
>
</File>
<File
RelativePath="..\..\..\..\src\mesa\main\teximage.h"
>
@ -1911,10 +1931,6 @@
RelativePath="..\..\..\..\src\mesa\main\varray.h"
>
</File>
<File
RelativePath="..\..\..\..\src\mesa\main\viewport.h"
>
</File>
<File
RelativePath="..\..\..\..\src\mesa\vbo\vbo.h"
>
@ -1947,6 +1963,10 @@
RelativePath="..\..\..\..\src\mesa\main\version.h"
>
</File>
<File
RelativePath="..\..\..\..\src\mesa\main\viewport.h"
>
</File>
<File
RelativePath="..\..\..\..\src\mesa\main\vtxfmt.h"
>

4
windows/VC8/mesa/osmesa/osmesa.vcproj
View File

@ -55,6 +55,7 @@
WarningLevel="3"
SuppressStartupBanner="true"
CompileAs="0"
ForcedIncludeFiles="../../../../src/mesa/main/compiler.h"
/>
<Tool
Name="VCManagedResourceCompilerTool"
@ -145,6 +146,7 @@
SuppressStartupBanner="true"
DebugInformationFormat="3"
CompileAs="0"
ForcedIncludeFiles="../../../../src/mesa/main/compiler.h"
/>
<Tool
Name="VCManagedResourceCompilerTool"
@ -236,6 +238,7 @@
SuppressStartupBanner="true"
DebugInformationFormat="3"
CompileAs="0"
ForcedIncludeFiles="../../../../src/mesa/main/compiler.h"
/>
<Tool
Name="VCManagedResourceCompilerTool"
@ -327,6 +330,7 @@
WarningLevel="3"
SuppressStartupBanner="true"
CompileAs="0"
ForcedIncludeFiles="../../../../src/mesa/main/compiler.h"
/>
<Tool
Name="VCManagedResourceCompilerTool"