summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJonathan Gray <jsg@cvs.openbsd.org>2016-01-24 01:04:18 +0000
committerJonathan Gray <jsg@cvs.openbsd.org>2016-01-24 01:04:18 +0000
commitbe0545197373e5331df04aed2a7b42ce7c71c70c (patch)
treefd3bd61e3ecdaafa35918c413d3056c0f4fc26ba
parentc8dc5d8e0c4219854676c19ba0c83a88b255bce9 (diff)
Import Mesa 11.0.9
-rw-r--r--lib/mesa/VERSION2
-rw-r--r--lib/mesa/docs/relnotes/11.0.8.html3
-rw-r--r--lib/mesa/docs/relnotes/11.0.9.html126
-rw-r--r--lib/mesa/src/egl/drivers/dri2/egl_dri2.c2
-rw-r--r--lib/mesa/src/mesa/drivers/dri/i915/intel_buffer_objects.c2
-rw-r--r--lib/mesa/src/mesa/drivers/dri/i915/intel_context.c2
-rw-r--r--lib/mesa/src/mesa/drivers/dri/i965/brw_context.c6
-rw-r--r--lib/mesa/src/mesa/drivers/dri/i965/intel_buffer_objects.c2
-rw-r--r--lib/mesa/src/mesa/drivers/dri/r200/radeon_buffer_objects.c2
-rw-r--r--lib/mesa/src/mesa/drivers/dri/radeon/radeon_buffer_objects.c2
-rw-r--r--lib/mesa/src/mesa/main/atifragshader.c2
-rw-r--r--lib/mesa/src/mesa/main/bufferobj.c2
-rw-r--r--lib/mesa/src/mesa/main/bufferobj.h4
-rw-r--r--lib/mesa/src/mesa/state_tracker/st_cb_bufferobjects.c3
-rw-r--r--lib/mesa/src/util/ralloc.c1
15 files changed, 149 insertions, 12 deletions
diff --git a/lib/mesa/VERSION b/lib/mesa/VERSION
index b32da199f..771a7f08f 100644
--- a/lib/mesa/VERSION
+++ b/lib/mesa/VERSION
@@ -1 +1 @@
-11.0.8
+11.0.9
diff --git a/lib/mesa/docs/relnotes/11.0.8.html b/lib/mesa/docs/relnotes/11.0.8.html
index df4b4c2c5..ce6e1d6a0 100644
--- a/lib/mesa/docs/relnotes/11.0.8.html
+++ b/lib/mesa/docs/relnotes/11.0.8.html
@@ -31,7 +31,8 @@ because compatibility contexts are not supported.
<h2>SHA256 checksums</h2>
<pre>
-TBD
+ab9db87b54d7525e4b611b82577ea9a9eae55927558df57b190059d5ecd9406f mesa-11.0.8.tar.gz
+5696e4730518b6805d2ed5def393c4293f425a2c2c01bd5ed4bdd7ad62f7ad75 mesa-11.0.8.tar.xz
</pre>
diff --git a/lib/mesa/docs/relnotes/11.0.9.html b/lib/mesa/docs/relnotes/11.0.9.html
new file mode 100644
index 000000000..3a49326c8
--- /dev/null
+++ b/lib/mesa/docs/relnotes/11.0.9.html
@@ -0,0 +1,126 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<html lang="en">
+<head>
+ <meta http-equiv="content-type" content="text/html; charset=utf-8">
+ <title>Mesa Release Notes</title>
+ <link rel="stylesheet" type="text/css" href="../mesa.css">
+</head>
+<body>
+
+<div class="header">
+ <h1>The Mesa 3D Graphics Library</h1>
+</div>
+
+<iframe src="../contents.html"></iframe>
+<div class="content">
+
+<h1>Mesa 11.0.9 Release Notes / January 22, 2016</h1>
+
+<p>
+Mesa 11.0.9 is a bug fix release which fixes bugs found since the 11.0.8 release.
+</p>
+<p>
+Mesa 11.0.9 implements the OpenGL 4.1 API, but the version reported by
+glGetString(GL_VERSION) or glGetIntegerv(GL_MAJOR_VERSION) /
+glGetIntegerv(GL_MINOR_VERSION) depends on the particular driver being used.
+Some drivers don't support all the features required in OpenGL 4.1. OpenGL
+4.1 is <strong>only</strong> available if requested at context creation
+because compatibility contexts are not supported.
+</p>
+
+
+<h2>SHA256 checksums</h2>
+<pre>
+TBD
+</pre>
+
+
+<h2>New features</h2>
+<p>None</p>
+
+<h2>Bug fixes</h2>
+
+<p>This list is likely incomplete.</p>
+
+<ul>
+
+<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=91596">Bug 91596</a> - EGL_KHR_gl_colorspace (v2) causes problem with Android-x86 GUI</li>
+
+<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=92229">Bug 92229</a> - [APITRACE] SOMA have serious graphical errors</li>
+
+<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=93257">Bug 93257</a> - [SKL, bisected] ASTC dEQP tests segfault</li>
+
+</ul>
+
+
+<h2>Changes</h2>
+
+<p>Emil Velikov (6):</p>
+<ul>
+ <li>docs: add sha256 checksums for 11.0.8</li>
+ <li>cherry-ignore: add patch already in branch</li>
+ <li>cherry-ignore: add the dri3 glx null check patch</li>
+ <li>i915: correctly parse/set the context flags</li>
+ <li>egl/dri2: expose srgb configs when KHR_gl_colorspace is available</li>
+ <li>Update version to 11.0.9</li>
+</ul>
+
+<p>Grazvydas Ignotas (1):</p>
+<ul>
+ <li>r600: fix constant buffer size programming</li>
+</ul>
+
+<p>Ilia Mirkin (5):</p>
+<ul>
+ <li>nvc0: don't forget to reset VTX_TMP bufctx slot after blit completion</li>
+ <li>nv50/ir: float(s32 &amp; 0xff) = float(u8), not s8</li>
+ <li>nv50,nvc0: make sure there's pushbuf space and that we ref the bo early</li>
+ <li>nv50,nvc0: fix crash when increasing bsp bo size for h264</li>
+ <li>nvc0: scale up inter_bo size so that it's 16M for a 4K video</li>
+</ul>
+
+<p>Kenneth Graunke (2):</p>
+<ul>
+ <li>ralloc: Fix ralloc_adopt() to the old context's last child's parent.</li>
+ <li>nvc0: Set winding order regardless of domain.</li>
+</ul>
+
+<p>Marek Olšák (1):</p>
+<ul>
+ <li>radeonsi: don't miss changes to SPI_TMPRING_SIZE</li>
+</ul>
+
+<p>Miklós Máté (1):</p>
+<ul>
+ <li>mesa: Don't leak ATIfs instructions in DeleteFragmentShader</li>
+</ul>
+
+<p>Neil Roberts (1):</p>
+<ul>
+ <li>i965: Fix crash when calling glViewport with no surface bound</li>
+</ul>
+
+<p>Nicolai Hähnle (6):</p>
+<ul>
+ <li>gallium/radeon: only dispose locally created target machine in radeon_llvm_compile</li>
+ <li>mesa/bufferobj: make _mesa_delete_buffer_object externally accessible</li>
+ <li>st/mesa: use _mesa_delete_buffer_object</li>
+ <li>radeon: use _mesa_delete_buffer_object</li>
+ <li>i915: use _mesa_delete_buffer_object</li>
+ <li>i965: use _mesa_delete_buffer_object</li>
+</ul>
+
+<p>Oded Gabbay (1):</p>
+<ul>
+ <li>llvmpipe: use vpkswss when dst is signed</li>
+</ul>
+
+<p>Rob Herring (1):</p>
+<ul>
+ <li>freedreno/ir3: fix 32-bit builds with pointer-to-int-cast error enabled</li>
+</ul>
+
+
+</div>
+</body>
+</html>
diff --git a/lib/mesa/src/egl/drivers/dri2/egl_dri2.c b/lib/mesa/src/egl/drivers/dri2/egl_dri2.c
index 10b434269..26aea6e22 100644
--- a/lib/mesa/src/egl/drivers/dri2/egl_dri2.c
+++ b/lib/mesa/src/egl/drivers/dri2/egl_dri2.c
@@ -236,6 +236,8 @@ dri2_add_config(_EGLDisplay *disp, const __DRIconfig *dri_config, int id,
case __DRI_ATTRIB_FRAMEBUFFER_SRGB_CAPABLE:
srgb = value != 0;
+ if (!disp->Extensions.KHR_gl_colorspace && srgb)
+ return NULL;
break;
default:
diff --git a/lib/mesa/src/mesa/drivers/dri/i915/intel_buffer_objects.c b/lib/mesa/src/mesa/drivers/dri/i915/intel_buffer_objects.c
index ef06743ed..e67609649 100644
--- a/lib/mesa/src/mesa/drivers/dri/i915/intel_buffer_objects.c
+++ b/lib/mesa/src/mesa/drivers/dri/i915/intel_buffer_objects.c
@@ -99,7 +99,7 @@ intel_bufferobj_free(struct gl_context * ctx, struct gl_buffer_object *obj)
_mesa_align_free(intel_obj->sys_buffer);
drm_intel_bo_unreference(intel_obj->buffer);
- free(intel_obj);
+ _mesa_delete_buffer_object(ctx, obj);
}
diff --git a/lib/mesa/src/mesa/drivers/dri/i915/intel_context.c b/lib/mesa/src/mesa/drivers/dri/i915/intel_context.c
index c78010322..fcc5a22db 100644
--- a/lib/mesa/src/mesa/drivers/dri/i915/intel_context.c
+++ b/lib/mesa/src/mesa/drivers/dri/i915/intel_context.c
@@ -426,6 +426,8 @@ intelInitContext(struct intel_context *intel,
return false;
}
+ driContextSetFlags(&intel->ctx, flags);
+
driContextPriv->driverPrivate = intel;
intel->driContext = driContextPriv;
diff --git a/lib/mesa/src/mesa/drivers/dri/i965/brw_context.c b/lib/mesa/src/mesa/drivers/dri/i965/brw_context.c
index 2e7b7ed46..b8f40d7fe 100644
--- a/lib/mesa/src/mesa/drivers/dri/i965/brw_context.c
+++ b/lib/mesa/src/mesa/drivers/dri/i965/brw_context.c
@@ -151,8 +151,10 @@ intel_viewport(struct gl_context *ctx)
__DRIcontext *driContext = brw->driContext;
if (_mesa_is_winsys_fbo(ctx->DrawBuffer)) {
- dri2InvalidateDrawable(driContext->driDrawablePriv);
- dri2InvalidateDrawable(driContext->driReadablePriv);
+ if (driContext->driDrawablePriv)
+ dri2InvalidateDrawable(driContext->driDrawablePriv);
+ if (driContext->driReadablePriv)
+ dri2InvalidateDrawable(driContext->driReadablePriv);
}
}
diff --git a/lib/mesa/src/mesa/drivers/dri/i965/intel_buffer_objects.c b/lib/mesa/src/mesa/drivers/dri/i965/intel_buffer_objects.c
index ff05b5cd0..f2d68a006 100644
--- a/lib/mesa/src/mesa/drivers/dri/i965/intel_buffer_objects.c
+++ b/lib/mesa/src/mesa/drivers/dri/i965/intel_buffer_objects.c
@@ -167,7 +167,7 @@ brw_delete_buffer(struct gl_context * ctx, struct gl_buffer_object *obj)
_mesa_buffer_unmap_all_mappings(ctx, obj);
drm_intel_bo_unreference(intel_obj->buffer);
- free(intel_obj);
+ _mesa_delete_buffer_object(ctx, obj);
}
diff --git a/lib/mesa/src/mesa/drivers/dri/r200/radeon_buffer_objects.c b/lib/mesa/src/mesa/drivers/dri/r200/radeon_buffer_objects.c
index d9d4f5ffc..2b76305dd 100644
--- a/lib/mesa/src/mesa/drivers/dri/r200/radeon_buffer_objects.c
+++ b/lib/mesa/src/mesa/drivers/dri/r200/radeon_buffer_objects.c
@@ -71,7 +71,7 @@ radeonDeleteBufferObject(struct gl_context * ctx,
radeon_bo_unref(radeon_obj->bo);
}
- free(radeon_obj);
+ _mesa_delete_buffer_object(ctx, obj);
}
diff --git a/lib/mesa/src/mesa/drivers/dri/radeon/radeon_buffer_objects.c b/lib/mesa/src/mesa/drivers/dri/radeon/radeon_buffer_objects.c
index d9d4f5ffc..2b76305dd 100644
--- a/lib/mesa/src/mesa/drivers/dri/radeon/radeon_buffer_objects.c
+++ b/lib/mesa/src/mesa/drivers/dri/radeon/radeon_buffer_objects.c
@@ -71,7 +71,7 @@ radeonDeleteBufferObject(struct gl_context * ctx,
radeon_bo_unref(radeon_obj->bo);
}
- free(radeon_obj);
+ _mesa_delete_buffer_object(ctx, obj);
}
diff --git a/lib/mesa/src/mesa/main/atifragshader.c b/lib/mesa/src/mesa/main/atifragshader.c
index 935ba05b7..3ddc51d60 100644
--- a/lib/mesa/src/mesa/main/atifragshader.c
+++ b/lib/mesa/src/mesa/main/atifragshader.c
@@ -293,7 +293,7 @@ _mesa_DeleteFragmentShaderATI(GLuint id)
prog->RefCount--;
if (prog->RefCount <= 0) {
assert(prog != &DummyShader);
- free(prog);
+ _mesa_delete_ati_fragment_shader(ctx, prog);
}
}
}
diff --git a/lib/mesa/src/mesa/main/bufferobj.c b/lib/mesa/src/mesa/main/bufferobj.c
index e17b41ce5..9fb008e45 100644
--- a/lib/mesa/src/mesa/main/bufferobj.c
+++ b/lib/mesa/src/mesa/main/bufferobj.c
@@ -412,7 +412,7 @@ _mesa_new_buffer_object(struct gl_context *ctx, GLuint name)
*
* Default callback for the \c dd_function_table::DeleteBuffer() hook.
*/
-static void
+void
_mesa_delete_buffer_object(struct gl_context *ctx,
struct gl_buffer_object *bufObj)
{
diff --git a/lib/mesa/src/mesa/main/bufferobj.h b/lib/mesa/src/mesa/main/bufferobj.h
index b5d73aec0..57f805281 100644
--- a/lib/mesa/src/mesa/main/bufferobj.h
+++ b/lib/mesa/src/mesa/main/bufferobj.h
@@ -110,6 +110,10 @@ _mesa_initialize_buffer_object(struct gl_context *ctx,
GLuint name);
extern void
+_mesa_delete_buffer_object(struct gl_context *ctx,
+ struct gl_buffer_object *bufObj);
+
+extern void
_mesa_reference_buffer_object_(struct gl_context *ctx,
struct gl_buffer_object **ptr,
struct gl_buffer_object *bufObj);
diff --git a/lib/mesa/src/mesa/state_tracker/st_cb_bufferobjects.c b/lib/mesa/src/mesa/state_tracker/st_cb_bufferobjects.c
index db254c214..157d974a0 100644
--- a/lib/mesa/src/mesa/state_tracker/st_cb_bufferobjects.c
+++ b/lib/mesa/src/mesa/state_tracker/st_cb_bufferobjects.c
@@ -83,8 +83,7 @@ st_bufferobj_free(struct gl_context *ctx, struct gl_buffer_object *obj)
if (st_obj->buffer)
pipe_resource_reference(&st_obj->buffer, NULL);
- free(st_obj->Base.Label);
- free(st_obj);
+ _mesa_delete_buffer_object(ctx, obj);
}
diff --git a/lib/mesa/src/util/ralloc.c b/lib/mesa/src/util/ralloc.c
index 01719c888..643df7662 100644
--- a/lib/mesa/src/util/ralloc.c
+++ b/lib/mesa/src/util/ralloc.c
@@ -293,6 +293,7 @@ ralloc_adopt(const void *new_ctx, void *old_ctx)
/* Connect the two lists together; parent them to new_ctx; make old_ctx empty. */
child->next = new_info->child;
+ child->parent = new_info;
new_info->child = old_info->child;
old_info->child = NULL;
}