metalefty/mesa
1
0
Fork 0
forked from rpms/mesa
Code Pull Requests Activity

- Pull the vtxfmt patch into the selinux-awareness patch, handle exec mem

Browse Source 
heap init failure correctly by releasing mutex.
This commit is contained in:
Kristian Høgsberg 2006-08-23 01:13:00 +00:00
parent 9e03815042
commit 1b24297a62
2 changed files with 158 additions and 106 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

249
mesa-6.5.1-selinux-awareness.patch
View File

@ -1,17 +1,41 @@
--- mesa-cvs/configs/linux-dri.selinux-awareness 2006-08-10 16:39:55.000000000 -0400 --- ./src/mesa/x86/rtasm/x86sse.h.selinux-awareness 2006-08-09 16:05:26.000000000 -0400
+++ mesa-cvs/configs/linux-dri 2006-08-10 16:39:55.000000000 -0400 +++ ./src/mesa/x86/rtasm/x86sse.h 2006-08-22 20:51:02.000000000 -0400
@@ -38,7 +38,8 @@ @@ -80,8 +80,8 @@
*/
LIBDRM_CFLAGS = `pkg-config --cflags libdrm`
LIBDRM_LIB = `pkg-config --libs libdrm`
-DRI_LIB_DEPS = $(EXTRA_LIB_PATH) -lm -lpthread -lexpat -ldl $(LIBDRM_LIB)
+DRI_LIB_DEPS = $(EXTRA_LIB_PATH) -lm -lpthread -lexpat -ldl $(LIBDRM_LIB) \
+ -lselinux
GL_LIB_DEPS = $(EXTRA_LIB_PATH) -lX11 -lXext -lXxf86vm -lm -lpthread -ldl \
$(LIBDRM_LIB)
--- mesa-cvs/src/mesa/main/execmem.c.selinux-awareness 2006-05-10 05:00:16.000000000 -0400 -void x86_init_func( struct x86_function *p );
+++ mesa-cvs/src/mesa/main/execmem.c 2006-08-10 16:39:55.000000000 -0400 -void x86_init_func_size( struct x86_function *p, GLuint code_size );
+int x86_init_func( struct x86_function *p );
+int x86_init_func_size( struct x86_function *p, GLuint code_size );
void x86_release_func( struct x86_function *p );
void (*x86_get_func( struct x86_function *p ))( void );
--- ./src/mesa/x86/rtasm/x86sse.c.selinux-awareness 2006-08-09 16:05:26.000000000 -0400
+++ ./src/mesa/x86/rtasm/x86sse.c 2006-08-22 20:51:02.000000000 -0400
@@ -1063,15 +1063,17 @@
}
-void x86_init_func( struct x86_function *p )
+int x86_init_func( struct x86_function *p )
{
- x86_init_func_size(p, 1024);
+ return x86_init_func_size(p, 1024);
}
-void x86_init_func_size( struct x86_function *p, GLuint code_size )
+int x86_init_func_size( struct x86_function *p, GLuint code_size )
{
p->store = _mesa_exec_malloc(code_size);
p->csr = p->store;
+
+ return (p->store != NULL);
}
void x86_release_func( struct x86_function *p )
--- ./src/mesa/main/execmem.c.selinux-awareness 2006-05-10 05:00:16.000000000 -0400
+++ ./src/mesa/main/execmem.c 2006-08-22 20:51:02.000000000 -0400
@@ -36,7 +36,7 @@ @@ -36,7 +36,7 @@
@ -62,94 +86,22 @@
- init_heap(); - init_heap();
+ if (!init_heap()) + if (!init_heap())
+ return NULL; + goto bail;
if (exec_heap) { if (exec_heap) {
size = (size + 31) & ~31; size = (size + 31) & ~31;
--- mesa-cvs/src/mesa/drivers/dri/r200/r200_context.c.selinux-awareness 2006-06-09 20:51:54.000000000 -0400 @@ -87,7 +98,8 @@
+++ mesa-cvs/src/mesa/drivers/dri/r200/r200_context.c 2006-08-10 16:39:55.000000000 -0400 addr = exec_mem + block->ofs;
@@ -546,8 +546,12 @@ else
} _mesa_printf("_mesa_exec_malloc failed\n");
-
if (rmesa->r200Screen->chip_flags & RADEON_CHIPSET_TCL) {
- if (tcl_mode >= DRI_CONF_TCL_VTXFMT)
- r200VtxfmtInit( ctx, tcl_mode >= DRI_CONF_TCL_CODEGEN );
+ void *test = NULL;
+ if ((test = _mesa_exec_malloc(64)))
+ if (tcl_mode >= DRI_CONF_TCL_VTXFMT)
+ r200VtxfmtInit( ctx, tcl_mode >= DRI_CONF_TCL_CODEGEN );
+ if (test)
+ _mesa_exec_free(test);
_tnl_need_dlist_norm_lengths( ctx, GL_FALSE );
}
--- mesa-cvs/src/mesa/drivers/dri/radeon/radeon_context.c.selinux-awareness 2006-04-09 13:48:28.000000000 -0400
+++ mesa-cvs/src/mesa/drivers/dri/radeon/radeon_context.c 2006-08-10 16:39:55.000000000 -0400
@@ -471,8 +471,12 @@
}
if (rmesa->radeonScreen->chip_flags & RADEON_CHIPSET_TCL) {
- if (tcl_mode >= DRI_CONF_TCL_VTXFMT)
- radeonVtxfmtInit( ctx, tcl_mode >= DRI_CONF_TCL_CODEGEN );
+ void *test = NULL;
+ if ((test = _mesa_exec_malloc(64)))
+ if (tcl_mode >= DRI_CONF_TCL_VTXFMT)
+ radeonVtxfmtInit( ctx, tcl_mode >= DRI_CONF_TCL_CODEGEN );
+ if (test)
+ _mesa_exec_free(test);
_tnl_need_dlist_norm_lengths( ctx, GL_FALSE );
}
--- mesa-cvs/src/mesa/shader/slang/slang_execute_x86.c.selinux-awareness 2006-08-09 16:05:26.000000000 -0400
+++ mesa-cvs/src/mesa/shader/slang/slang_execute_x86.c 2006-08-10 16:41:07.000000000 -0400
@@ -666,7 +666,8 @@
* The built-in library occupies 450K, so we can be safe for now.
* It is going to change in the future, when we get assembly analysis running.
*/
- x86_init_func_size (&G.f, 1048576);
+ if (!x86_init_func_size (&G.f, 1048576))
+ return 0;
G.r_eax = x86_make_reg (file_REG32, reg_AX);
G.r_ecx = x86_make_reg (file_REG32, reg_CX);
G.r_edx = x86_make_reg (file_REG32, reg_DX);
--- mesa-cvs/src/mesa/x86/rtasm/x86sse.c.selinux-awareness 2006-08-09 16:05:26.000000000 -0400
+++ mesa-cvs/src/mesa/x86/rtasm/x86sse.c 2006-08-10 16:42:21.000000000 -0400
@@ -1063,15 +1063,17 @@
}
-void x86_init_func( struct x86_function *p )
+int x86_init_func( struct x86_function *p )
{
- x86_init_func_size(p, 1024);
+ return x86_init_func_size(p, 1024);
}
-void x86_init_func_size( struct x86_function *p, GLuint code_size )
+int x86_init_func_size( struct x86_function *p, GLuint code_size )
{
p->store = _mesa_exec_malloc(code_size);
p->csr = p->store;
+ +
+ return (p->store != NULL); + bail:
} _glthread_UNLOCK_MUTEX(exec_mutex);
void x86_release_func( struct x86_function *p ) return addr;
--- mesa-cvs/src/mesa/x86/rtasm/x86sse.h.selinux-awareness 2006-08-09 16:05:26.000000000 -0400 --- ./src/mesa/tnl/t_vb_arbprogram_sse.c.selinux-awareness 2006-06-01 18:56:40.000000000 -0400
+++ mesa-cvs/src/mesa/x86/rtasm/x86sse.h 2006-08-10 16:42:43.000000000 -0400 +++ ./src/mesa/tnl/t_vb_arbprogram_sse.c 2006-08-22 20:51:02.000000000 -0400
@@ -80,8 +80,8 @@
*/
-void x86_init_func( struct x86_function *p );
-void x86_init_func_size( struct x86_function *p, GLuint code_size );
+int x86_init_func( struct x86_function *p );
+int x86_init_func_size( struct x86_function *p, GLuint code_size );
void x86_release_func( struct x86_function *p );
void (*x86_get_func( struct x86_function *p ))( void );
--- mesa-cvs/src/mesa/tnl/t_vb_arbprogram_sse.c.selinux-awareness 2006-06-01 18:56:40.000000000 -0400
+++ mesa-cvs/src/mesa/tnl/t_vb_arbprogram_sse.c 2006-08-10 16:39:55.000000000 -0400
@@ -1298,7 +1298,8 @@ @@ -1298,7 +1298,8 @@
p->compiled_func = NULL; p->compiled_func = NULL;
} }
@ -160,8 +112,8 @@
cp.fpucntl = RESTORE_FPU; cp.fpucntl = RESTORE_FPU;
--- mesa-cvs/src/mesa/tnl/t_vertex_sse.c.selinux-awareness 2005-09-16 14:14:25.000000000 -0400 --- ./src/mesa/tnl/t_vertex_sse.c.selinux-awareness 2005-09-16 14:14:25.000000000 -0400
+++ mesa-cvs/src/mesa/tnl/t_vertex_sse.c 2006-08-10 16:39:55.000000000 -0400 +++ ./src/mesa/tnl/t_vertex_sse.c 2006-08-22 20:51:02.000000000 -0400
@@ -348,7 +348,8 @@ @@ -348,7 +348,8 @@
struct x86_reg vp1 = x86_make_reg(file_XMM, 2); struct x86_reg vp1 = x86_make_reg(file_XMM, 2);
GLubyte *fixup, *label; GLubyte *fixup, *label;
@ -184,3 +136,106 @@
if (build_vertex_emit(&p)) { if (build_vertex_emit(&p)) {
_tnl_register_fastpath( vtx, GL_TRUE ); _tnl_register_fastpath( vtx, GL_TRUE );
--- ./src/mesa/drivers/dri/radeon/radeon_context.c.selinux-awareness 2006-04-09 13:48:28.000000000 -0400
+++ ./src/mesa/drivers/dri/radeon/radeon_context.c 2006-08-22 20:51:02.000000000 -0400
@@ -471,11 +471,20 @@
}
if (rmesa->radeonScreen->chip_flags & RADEON_CHIPSET_TCL) {
- if (tcl_mode >= DRI_CONF_TCL_VTXFMT)
- radeonVtxfmtInit( ctx, tcl_mode >= DRI_CONF_TCL_CODEGEN );
+ void *test = NULL;
+ if ((test = _mesa_exec_malloc(64))) {
+ if (tcl_mode >= DRI_CONF_TCL_VTXFMT)
+ radeonVtxfmtInit( ctx, tcl_mode >= DRI_CONF_TCL_CODEGEN );
+ } else {
+ tcl_mode = DRI_CONF_TCL_PIPELINED;
+ }
+ if (test)
+ _mesa_exec_free(test);
_tnl_need_dlist_norm_lengths( ctx, GL_FALSE );
}
+
+ rmesa->tcl_mode = tcl_mode;
return GL_TRUE;
}
@@ -516,8 +525,7 @@
}
if (!(rmesa->TclFallback & RADEON_TCL_FALLBACK_TCL_DISABLE)) {
- int tcl_mode = driQueryOptioni(&rmesa->optionCache, "tcl_mode");
- if (tcl_mode >= DRI_CONF_TCL_VTXFMT)
+ if (rmesa->tcl_mode >= DRI_CONF_TCL_VTXFMT)
radeonVtxfmtDestroy( rmesa->glCtx );
}
--- ./src/mesa/drivers/dri/r200/r200_context.c.selinux-awareness 2006-06-09 20:51:54.000000000 -0400
+++ ./src/mesa/drivers/dri/r200/r200_context.c 2006-08-22 20:51:02.000000000 -0400
@@ -546,11 +546,19 @@
}
if (rmesa->r200Screen->chip_flags & RADEON_CHIPSET_TCL) {
- if (tcl_mode >= DRI_CONF_TCL_VTXFMT)
- r200VtxfmtInit( ctx, tcl_mode >= DRI_CONF_TCL_CODEGEN );
+ void *test = NULL;
+ if ((test = _mesa_exec_malloc(64))) {
+ if (tcl_mode >= DRI_CONF_TCL_VTXFMT)
+ r200VtxfmtInit( ctx, tcl_mode >= DRI_CONF_TCL_CODEGEN );
+ } else {
+ tcl_mode = DRI_CONF_TCL_PIPELINED;
+ }
+ if (test)
+ _mesa_exec_free(test);
_tnl_need_dlist_norm_lengths( ctx, GL_FALSE );
}
+ rmesa->tcl_mode = tcl_mode;
return GL_TRUE;
}
@@ -592,8 +600,7 @@
}
if (!(rmesa->TclFallback & R200_TCL_FALLBACK_TCL_DISABLE)) {
- int tcl_mode = driQueryOptioni(&rmesa->optionCache, "tcl_mode");
- if (tcl_mode >= DRI_CONF_TCL_VTXFMT)
+ if (rmesa->tcl_mode >= DRI_CONF_TCL_VTXFMT)
r200VtxfmtDestroy( rmesa->glCtx );
}
--- ./src/mesa/drivers/dri/r200/r200_context.h.selinux-awareness 2006-08-22 21:06:15.000000000 -0400
+++ ./src/mesa/drivers/dri/r200/r200_context.h 2006-08-22 21:06:44.000000000 -0400
@@ -990,6 +990,7 @@
GLuint TexGenEnabled;
GLuint TexGenCompSel;
GLmatrix tmpmat;
+ GLint tcl_mode;
/* VBI / buffer swap
*/
--- ./src/mesa/shader/slang/slang_execute_x86.c.selinux-awareness 2006-08-09 16:05:26.000000000 -0400
+++ ./src/mesa/shader/slang/slang_execute_x86.c 2006-08-22 20:51:02.000000000 -0400
@@ -666,7 +666,8 @@
* The built-in library occupies 450K, so we can be safe for now.
* It is going to change in the future, when we get assembly analysis running.
*/
- x86_init_func_size (&G.f, 1048576);
+ if (!x86_init_func_size (&G.f, 1048576))
+ return 0;
G.r_eax = x86_make_reg (file_REG32, reg_AX);
G.r_ecx = x86_make_reg (file_REG32, reg_CX);
G.r_edx = x86_make_reg (file_REG32, reg_DX);
--- ./configs/linux-dri.selinux-awareness 2006-08-22 20:51:02.000000000 -0400
+++ ./configs/linux-dri 2006-08-22 20:51:02.000000000 -0400
@@ -38,7 +38,8 @@
LIBDRM_CFLAGS = `pkg-config --cflags libdrm`
LIBDRM_LIB = `pkg-config --libs libdrm`
-DRI_LIB_DEPS = $(EXTRA_LIB_PATH) -lm -lpthread -lexpat -ldl $(LIBDRM_LIB)
+DRI_LIB_DEPS = $(EXTRA_LIB_PATH) -lm -lpthread -lexpat -ldl $(LIBDRM_LIB) \
+ -lselinux
GL_LIB_DEPS = $(EXTRA_LIB_PATH) -lX11 -lXext -lXxf86vm -lm -lpthread -ldl \
$(LIBDRM_LIB)

13
mesa.spec
View File

@ -36,7 +36,7 @@
Summary: Mesa graphics libraries Summary: Mesa graphics libraries
Name: mesa Name: mesa
Version: 6.5 Version: 6.5
Release: 25.%{snapshot}cvs%{?dist} Release: 26.%{snapshot}cvs%{?dist}
License: MIT/X11 License: MIT/X11
Group: System Environment/Libraries Group: System Environment/Libraries
URL: http://www.mesa3d.org URL: http://www.mesa3d.org
@ -58,7 +58,6 @@ Patch11: mesa-6.4-multilib-fix.patch
Patch12: mesa-modular-dri-dir.patch Patch12: mesa-modular-dri-dir.patch
Patch14: mesa-6.5-drop-static-inline.patch Patch14: mesa-6.5-drop-static-inline.patch
Patch18: mesa-6.5.1-selinux-awareness.patch Patch18: mesa-6.5.1-selinux-awareness.patch
Patch19: mesa-6.5.1-radeon-vtxfmt-cleanup-properly.patch
Patch20: mesa-6.5.1-r300-smooth-line.patch Patch20: mesa-6.5.1-r300-smooth-line.patch
Patch21: mesa-6.5-force-r300.patch Patch21: mesa-6.5-force-r300.patch
@ -309,17 +308,11 @@ install -m 755 %{SOURCE12} ./
%patch11 -p0 -b .multilib-fix %patch11 -p0 -b .multilib-fix
%patch14 -p0 -b .drop-static-inline %patch14 -p0 -b .drop-static-inline
%patch18 -p1 -b .selinux-awareness %patch18 -p1 -b .selinux-awareness
%patch19 -p1 -b .vtxfmt
%patch20 -p1 -b .r300-smooth-lines %patch20 -p1 -b .r300-smooth-lines
%patch21 -p0 -b .force-r300 %patch21 -p0 -b .force-r300
# According to Adam, this patch makes metacity's compositing
# manager noticeably faster, but also may be a little too big of
# a change for post feature freeze. Leaving off for now...
#%patch200 -p0 -b .texture-from-pixmap-fixes
%patch201 -p1 -b .radeon-use-right-format %patch201 -p1 -b .radeon-use-right-format
#%patch202 -p0 -b .tfp-fbconfig-attribs
# WARNING: The following files are copyright "Mark J. Kilgard" under the GLUT # WARNING: The following files are copyright "Mark J. Kilgard" under the GLUT
# license and are not open source/free software, so we remove them. # license and are not open source/free software, so we remove them.
@ -512,6 +505,10 @@ rm -rf $RPM_BUILD_ROOT
%{_bindir}/glxinfo %{_bindir}/glxinfo
%changelog %changelog
* Tue Aug 22 2006 Kristian Høgsberg <krh@redhat.com> 6.5-26.20060818cvs.fc6
- Pull the vtxfmt patch into the selinux-awareness patch, handle exec
mem heap init failure correctly by releasing mutex.
* Tue Aug 22 2006 Adam Jackson <ajackson@redhat.com> 6.5-25.20060818cvs.fc6 * Tue Aug 22 2006 Adam Jackson <ajackson@redhat.com> 6.5-25.20060818cvs.fc6
- mesa-6.5.1-r300-smooth-line.patch: Added, fakes smooth lines with aliased - mesa-6.5.1-r300-smooth-line.patch: Added, fakes smooth lines with aliased
lines on R300+ cards, makes Google Earth tolerable. lines on R300+ cards, makes Google Earth tolerable.