aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--mesalib/docs/news.html14
-rw-r--r--mesalib/docs/relnotes-7.11.1.html391
-rw-r--r--mesalib/docs/relnotes-7.11.html266
-rw-r--r--xorg-server/xkeyboard-config/rules/base.o_s.part1
-rw-r--r--xorg-server/xkeyboard-config/rules/base.xml.in7
-rw-r--r--xorg-server/xkeyboard-config/symbols/jp6
-rw-r--r--xorg-server/xkeyboard-config/symbols/tw1
7 files changed, 684 insertions, 2 deletions
diff --git a/mesalib/docs/news.html b/mesalib/docs/news.html
index eea6cd609..e328301a8 100644
--- a/mesalib/docs/news.html
+++ b/mesalib/docs/news.html
@@ -11,6 +11,20 @@
<H1>News</H1>
+<h2>November 17, 2011</h2>
+
+<p>
+<a href="relnotes-7.11.1.html">Mesa 7.11.1</a> is released. This is a bug
+fix release.
+</p>
+
+<h2>July 31, 2011</h2>
+
+<p>
+<a href="relnotes-7.11.html">Mesa 7.11</a> (final) is released. This is a new
+development release.
+</p>
+
<h2>June 13, 2011</h2>
<p>
diff --git a/mesalib/docs/relnotes-7.11.1.html b/mesalib/docs/relnotes-7.11.1.html
new file mode 100644
index 000000000..3941baaf4
--- /dev/null
+++ b/mesalib/docs/relnotes-7.11.1.html
@@ -0,0 +1,391 @@
+<HTML>
+
+<head>
+<TITLE>Mesa Release Notes</TITLE>
+<link rel="stylesheet" type="text/css" href="mesa.css">
+<meta http-equiv="content-type" content="text/html; charset=utf-8" />
+</head>
+
+<BODY>
+
+<body bgcolor="#eeeeee">
+
+<H1>Mesa 7.11.1 Release Notes / November 17, 2011</H1>
+
+<p>
+Mesa 7.11.1 is a bug fix release which fixes bugs found since the 7.11 release.
+</p>
+<p>
+Mesa 7.11 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>
+ac0181a4076770fb657c1169af43aa09 MesaLib-7.11.1.tar.gz
+a77307102cee844ff6544ffa8fafeac1 MesaLib-7.11.1.tar.bz2
+dfcb11516c1730f3981b55a65a835623 MesaLib-7.11.1.zip
+2cb2b9ecb4fb7d1a6be69346ee886952 MesaGLUT-7.11.1.tar.gz
+3f54e314290d4dacbab089839197080b MesaGLUT-7.11.1.tar.bz2
+5d66c7ee8c5cc2f27e1ffb037ad4172c MesaGLUT-7.11.1.zip
+</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=3165">Bug 3165</a> - texImage.IsCompressed and texImage.CompressedSize issues</li>
+
+<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=23525">Bug 23525</a> - Software rendering on QEMU guests badly broken</li>
+
+<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=28125">Bug 28125</a> - DRI2 prevents indirect glx</li>
+
+<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=34628">Bug 34628</a> - [ilk] skybox errors in quake4</li>
+
+<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=36371">Bug 36371</a> - r200: piglit readPixSanity failure</li>
+
+<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=36669">Bug 36669</a> - EmitNoMainReturn set to 1 doesn't make the GLSL compiler lower all the RET opcodes</li>
+
+<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=36939">Bug 36939</a> - multitexturing is messed up in quake wars (regression)</li>
+
+<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=37907">Bug 37907</a> - [swrast] SIGSEGV swrast/s_depth.c:569</li>
+
+<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=38163">Bug 38163</a> - Gnome Shell Display Bug</li>
+
+<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=38625">Bug 38625</a> - ast_to_hir.cpp:1761: const glsl_type* process_array_type(YYLTYPE*, const glsl_type*, ast_node*, _mesa_glsl_parse_state*): Assertion `dummy_instructions.is_empty()' failed.</li>
+
+<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=38729">Bug 38729</a> - [softpipe] sp_quad_depth_test.c:215:convert_quad_stencil: Assertion `0' failed.</li>
+
+<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=38863">Bug 38863</a> - [IVB]GPU hang when running 3D games like openarena</li>
+
+<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=39193">Bug 39193</a> - [llvmpipe and r600g] glCheckFramebufferStatusEXT segfaults in Gallium when checking status on a framebuffer bound to a texture that's bound to a pixmap</li>
+
+<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=39651">Bug 39651</a> - [glsl] Assertion failure when implicitly converting out parameters</li>
+
+<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=39991">Bug 39991</a> - [regression]GL_PALETTE8_RGBA8_OES format of glCompressedTexImage2D will cause err GL_INVALID_ENUM with GLES1.x</li>
+
+<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=40022">Bug 40022</a> - [i915] out-of-bounds write src/mesa/drivers/dri/i915/i915_fragprog.c:321</li>
+
+<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=40062">Bug 40062</a> - in etqw the strogg radar is black (regression)</li>
+
+<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=40324">Bug 40324</a> - [SNB] gpu hang in mesa 7.11</li>
+
+<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=40533">Bug 40533</a> - i915: piglit glean/readPixSanity: DRI2SwapBuffers: BadDrawable (invalid Pixmap or Window parameter)</li>
+
+<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=41096">Bug 41096</a> - [sandybridge-m-gt2+] GPU lockup render.IPEHR: 0x7a000002</li>
+
+<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=41969">Bug 41969</a> - The Mesa meta save/restore code doesn't always save the active program</li>
+
+<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=42175">Bug 42175</a> - RV730: Display errors in glxgears &amp; WebGL</li>
+
+<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=42268">Bug 42268</a> - [bisected] oglc pbo(negative.invalidOffsetValue) aborts on 7.11 branch</li>
+
+<!-- <li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=">Bug </a> - </li> -->
+
+</ul>
+
+
+<h2>Changes</h2>
+<p>The full set of changes can be viewed by using the following GIT command:</p>
+
+<pre>
+ git log mesa-7.11..mesa-7.11.1
+</pre>
+
+<p>Adam Jackson (2):
+<ul>
+ <li>drisw: Remove cargo culting that breaks GLX 1.3 ctors</li>
+ <li>glx: Don't enable INTEL_swap_event unconditionally</li>
+</ul></p>
+
+<p>Alex Deucher (1):
+<ul>
+ <li>r600g: fix up vs export handling</li>
+</ul></p>
+
+<p>Ben Widawsky (1):
+<ul>
+ <li>intel: GetBuffer fix</li>
+</ul></p>
+
+<p>Brian Paul (15):
+<ul>
+ <li>docs: add 7.11 md5 sums</li>
+ <li>docs: news item for 7.11 release</li>
+ <li>st/mesa: Convert size assertions to conditionals in st_texture_image_copy.</li>
+ <li>softpipe: add missing stencil format case in convert_quad_stencil()</li>
+ <li>mesa: fix texstore addressing bugs for depth/stencil formats</li>
+ <li>mesa: add missing breaks for GL_TEXTURE_CUBE_MAP_SEAMLESS queries</li>
+ <li>swrast: don't try to do depth testing if there's no depth buffer</li>
+ <li>meta: fix/add checks for GL_EXT_framebuffer_sRGB</li>
+ <li>mesa: fix PACK_COLOR_5551(), PACK_COLOR_1555() macros</li>
+ <li>meta: fix broken sRGB mipmap generation</li>
+ <li>mesa: add _NEW_CURRENT_ATTRIB in _mesa_program_state_flags()</li>
+ <li>mesa: fix error handling for dlist image unpacking</li>
+ <li>mesa: generate GL_INVALID_OPERATION in glIsEnabledIndex() between Begin/End</li>
+ <li>mesa: fix incorrect error code in _mesa_FramebufferTexture1D/3DEXT()</li>
+ <li>mesa: fix format/type check in unpack_image() for bitmaps</li>
+</ul></p>
+
+<p>Carl Simonson (1):
+<ul>
+ <li>i830: Add missing vtable entry for i830 from the hiz work.</li>
+</ul></p>
+
+<p>Carl Worth (5):
+<ul>
+ <li>glcpp: Fix two (or more) successive applications of token pasting</li>
+ <li>glcpp: Test a non-function-like macro using the token paste operator</li>
+ <li>glcpp: Implement token pasting for non-function-like macros</li>
+ <li>glcpp: Raise error if defining any macro containing two consecutive underscores</li>
+ <li>glcpp: Add a test for #elif with an undefined macro.</li>
+</ul></p>
+
+<p>Chad Versace (5):
+<ul>
+ <li>glsl: Add method glsl_type::can_implicitly_convert_to()</li>
+ <li>glsl: Fix implicit conversions in non-constructor function calls</li>
+ <li>glsl: Remove ir_function.cpp:type_compare()</li>
+ <li>glsl: Fix conversions in array constructors</li>
+ <li>x86-64: Fix compile error with clang</li>
+</ul></p>
+
+<p>Chia-I Wu (3):
+<ul>
+ <li>glsl: empty declarations should be valid</li>
+ <li>intel: rename intel_extensions_es2.c to intel_extensions_es.c</li>
+ <li>intel: fix GLESv1 support</li>
+</ul></p>
+
+<p>Chris Wilson (1):
+<ul>
+ <li>i915: out-of-bounds write in calc_live_regs()</li>
+</ul></p>
+
+<p>Christopher James Halse Rogers (1):
+<ul>
+ <li>glx/dri2: Paper over errors in DRI2Connect when indirect</li>
+</ul></p>
+
+<p>David Reveman (1):
+<ul>
+ <li>i915g: Fix off-by-one in scissors.</li>
+</ul></p>
+
+<p>Eric Anholt (16):
+<ul>
+ <li>mesa: Don't skip glGetProgramEnvParam4dvARB if there was already an error.</li>
+ <li>mesa: Fix glGetUniform() type conversions.</li>
+ <li>mesa: Add support for Begin/EndConditionalRender in display lists.</li>
+ <li>mesa: Throw an error instead of asserting for condrender with query == 0.</li>
+ <li>mesa: Throw an error when starting conditional render on an active query.</li>
+ <li>mesa: Don't skip glGetProgramLocalParam4dvARB if there was already an error.</li>
+ <li>glsl: Allow ir_assignment() constructor to not specify condition.</li>
+ <li>glsl: Clarify error message about whole-array assignment in GLSL 1.10.</li>
+ <li>glsl: When assigning to a whole array, mark the array as accessed.</li>
+ <li>glsl: When assiging from a whole array, mark it as used.</li>
+ <li>i965/fs: Respect ARB_color_buffer_float clamping.</li>
+ <li>i965: Add missing _NEW_POLYGON flag to polygon stipple upload.</li>
+ <li>i965: Fix polygon stipple offset state flagging.</li>
+ <li>intel: Mark MESA_FORMAT_X8_Z24 as always supported.</li>
+ <li>mesa: Don't error on glFeedbackBuffer(size = 0, buffer = NULL)</li>
+ <li>glsl: Fix gl_NormalMatrix swizzle setup to match i965's invariants.</li>
+</ul></p>
+
+<p>Henri Verbeet (6):
+<ul>
+ <li>mesa: Also set the remaining draw buffers to GL_NONE when updating just the first buffer in _mesa_drawbuffers().</li>
+ <li>r600g: Support the PIPE_FORMAT_R16_FLOAT colorformat.</li>
+ <li>mesa: Check the texture against all units in unbind_texobj_from_texunits().</li>
+ <li>mesa: Allow sampling from units &gt;= MAX_TEXTURE_UNITS in shaders.</li>
+ <li>mesa: Use the Elements macro for the sampler index assert in validate_samplers().</li>
+ <li>mesa: Fix a couple of TexEnv unit limits.</li>
+</ul></p>
+
+<p>Ian Romanick (17):
+<ul>
+ <li>mesa: Add utility function to get base format from a GL compressed format</li>
+ <li>mesa: Return the correct internal fmt when a generic compressed fmt was used</li>
+ <li>mesa: Make _mesa_get_compressed_formats match the texture compression specs</li>
+ <li>linker: Make linker_error set LinkStatus to false</li>
+ <li>linker: Make linker_{error,warning} generally available</li>
+ <li>mesa: Ensure that gl_shader_program::InfoLog is never NULL</li>
+ <li>ir_to_mesa: Use Add linker_error instead of fail_link</li>
+ <li>ir_to_mesa: Emit warnings instead of errors for IR that can't be lowered</li>
+ <li>i915: Fail without crashing if a Mesa IR program uses too many registers</li>
+ <li>i915: Only emit program errors when INTEL_DEBUG=wm or INTEL_DEBUG=fallbacks</li>
+ <li>mesa: Add GL_OES_compressed_paletted_texture formats to _mesa_is_compressed_format</li>
+ <li>mesa: Add GL_OES_compressed_paletted_texture formats to _mesa_base_tex_format</li>
+ <li>mesa: Refactor expected texture size check in cpal_get_info</li>
+ <li>mesa: Add _mesa_cpal_compressed_format_type</li>
+ <li>mesa: Refactor compressed texture error checks to work with paletted textures</li>
+ <li>mesa: Remove redundant compressed paletted texture error checks</li>
+ <li>mesa: Advertise GL_OES_compressed_paletted_texture in OpenGL ES1.x</li>
+</ul></p>
+
+<p>Jeremy Huddleston (3):
+<ul>
+ <li>apple: Silence some debug spew</li>
+ <li>apple: Use the correct (OpenGL.framework) glViewport and glScissor during init</li>
+ <li>apple: Implement applegl_unbind_context</li>
+</ul></p>
+
+<p>José Fonseca (1):
+<ul>
+ <li>docs: Update llvmpipe docs.</li>
+</ul></p>
+
+<p>Kenneth Graunke (12):
+<ul>
+ <li>glsl: Avoid massive ralloc_strndup overhead in S-Expression parsing.</li>
+ <li>mesa: In validate_program(), initialize errMsg for safety.</li>
+ <li>i965/gen5+: Fix incorrect miptree layout for non-power-of-two cubemaps.</li>
+ <li>i965: Use proper texture alignment units for cubemaps on Gen5+.</li>
+ <li>i965: Fix incorrect maximum PS thread count shift on Ivybridge.</li>
+ <li>i965: Emit depth stalls and flushes before changing depth state on Gen6+.</li>
+ <li>i965/fs: Allow SIMD16 with control flow on Ivybridge.</li>
+ <li>i965: Allow SIMD16 color writes on Ivybridge.</li>
+ <li>i965: Fix inconsistent indentation in brw_eu_emit.c.</li>
+ <li>intel: Depth format fixes</li>
+ <li>i965: Apply post-sync non-zero workaround to homebrew workaround.</li>
+ <li>mesa/get: Move MAX_LIGHTS from GL/ES2 to GL/ES1.</li>
+</ul></p>
+
+<p>Kristian Høgsberg (1):
+<ul>
+ <li>glx: Don't flush twice if we fallback to dri2CopySubBuffer</li>
+</ul></p>
+
+<p>Marc Pignat (1):
+<ul>
+ <li>drisw: Fix 24bpp software rendering, take 2</li>
+</ul></p>
+
+<p>Marcin Baczyński (2):
+<ul>
+ <li>configure: fix gcc version check</li>
+ <li>configure: allow C{,XX}FLAGS override</li>
+</ul></p>
+
+<p>Marcin Slusarz (3):
+<ul>
+ <li>nouveau: fix nouveau_fence leak</li>
+ <li>nouveau: fix crash during fence emission</li>
+ <li>nouveau: fix fence hang</li>
+</ul></p>
+
+<p>Marek Olšák (19):
+<ul>
+ <li>vbo: do not call _mesa_max_buffer_index in debug builds</li>
+ <li>winsys/radeon: fix space checking</li>
+ <li>r300/compiler: fix a warning that a variable may be uninitialized</li>
+ <li>r300/compiler: remove an unused-but-set variable and simplify the code</li>
+ <li>u_vbuf_mgr: cleanup original vs real vertex buffer arrays</li>
+ <li>u_vbuf_mgr: don't take per-instance attribs into acc. when computing max index</li>
+ <li>u_vbuf_mgr: fix max_index computation for large src_offset</li>
+ <li>u_vbuf_mgr: s/u_vbuf_mgr_/u_vbuf_</li>
+ <li>u_vbuf_mgr: remove unused flag U_VBUF_UPLOAD_FLUSHED</li>
+ <li>u_vbuf_mgr: rework user buffer uploads</li>
+ <li>u_vbuf_mgr: fix uploading with a non-zero index bias</li>
+ <li>configure.ac: fix xlib-based softpipe build</li>
+ <li>r600g: add index_bias to index buffer bounds</li>
+ <li>r300g: fix rendering with a non-zero index bias in draw_elements_immediate</li>
+ <li>Revert "r300g: fix rendering with a non-zero index bias in draw_elements_immediate"</li>
+ <li>pb_bufmgr_cache: flush cache when create_buffer fails and try again</li>
+ <li>r300g: don't return NULL in resource_from_handle if the resource is too small</li>
+ <li>r600g: set correct tiling flags in depth info</li>
+ <li>r300g: don't call u_trim_pipe_prim in r300_swtcl_draw_vbo</li>
+</ul></p>
+
+<p>Michel Dänzer (4):
+<ul>
+ <li>st/mesa: Finalize texture on render-to-texture.</li>
+ <li>glx/dri2: Don't call X server for SwapBuffers when there's no back buffer.</li>
+ <li>gallium/util: Add macros for converting from little endian to CPU byte order.</li>
+ <li>r300g: Fix queries on big endian hosts.</li>
+</ul></p>
+
+<p>Neil Roberts (1):
+<ul>
+ <li>meta: Fix saving the active program</li>
+</ul></p>
+
+<p>Paul Berry (18):
+<ul>
+ <li>glsl: Lower unconditional return statements.</li>
+ <li>glsl: Refactor logic for determining whether to lower return statements.</li>
+ <li>glsl: lower unconditional returns and continues in loops.</li>
+ <li>glsl: Use foreach_list in lower_jumps.cpp</li>
+ <li>glsl: In lower_jumps.cpp, lower both branches of a conditional.</li>
+ <li>glsl: Lower break instructions when necessary at the end of a loop.</li>
+ <li>glsl: improve the accuracy of the radians() builtin function</li>
+ <li>glsl: improve the accuracy of the atan(x,y) builtin function.</li>
+ <li>Revert "glsl: Skip processing the first function's body in do_dead_functions()."</li>
+ <li>glsl: Emit function signatures at toplevel, even for built-ins.</li>
+ <li>glsl: Constant-fold built-in functions before outputting IR</li>
+ <li>glsl: Check array size is const before asserting that no IR was generated.</li>
+ <li>glsl: Perform implicit type conversions on function call out parameters.</li>
+ <li>glsl: Fix type error when lowering integer divisions</li>
+ <li>glsl: Rework oversize array check for gl_TexCoord.</li>
+ <li>glsl: Remove field array_lvalue from ir_variable.</li>
+ <li>glsl hierarchical visitor: Do not overwrite base_ir for parameter lists.</li>
+ <li>glsl: improve the accuracy of the asin() builtin function.</li>
+</ul></p>
+
+<p>Tobias Droste (1):
+<ul>
+ <li>r300/compiler: simplify code in peephole_add_presub_add</li>
+</ul></p>
+
+<p>Tom Fogal (1):
+<ul>
+ <li>Only use gcc visibility support with gcc4+.</li>
+</ul></p>
+
+<p>Tom Stellard (1):
+<ul>
+ <li>r300/compiler: Fix regalloc for values with multiple writers</li>
+</ul></p>
+
+<p>Vadim Girlin (5):
+<ul>
+ <li>st/mesa: flush bitmap cache on query and conditional render boundaries</li>
+ <li>r600g: use backend mask for occlusion queries</li>
+ <li>r600g: take into account force_add_cf in pops</li>
+ <li>r600g: fix check_and_set_bank_swizzle</li>
+ <li>r600g: fix replace_gpr_with_pv_ps</li>
+</ul></p>
+
+<p>Yuanhan Liu (17):
+<ul>
+ <li>i965: fix the constant interp bitmask for flat mode</li>
+ <li>mesa: fix error handling for glEvalMesh1/2D</li>
+ <li>mesa: fix error handling for some glGet* functions</li>
+ <li>mesa: fix error handling for glTexEnv</li>
+ <li>mesa: fix error handling for glIsEnabled</li>
+ <li>mesa: fix error handling for glPixelZoom</li>
+ <li>mesa: fix error handling for glSelectBuffer</li>
+ <li>mesa: fix error handling for glMapBufferRange</li>
+ <li>mesa: fix error handling for glMaterial*</li>
+ <li>intel: fix the wrong code to detect null texture.</li>
+ <li>mesa: add a function to do the image data copy stuff for save_CompressedTex(Sub)Image</li>
+ <li>i965: setup address rounding enable bits</li>
+ <li>mesa: generate error if pbo offset is not aligned with the size of specified type</li>
+ <li>mesa: fix inverted pbo test error at _mesa_GetnCompressedTexImageARB</li>
+ <li>mesa: handle the pbo case for save_Bitmap</li>
+ <li>mesa: handle PBO access error in display list mode</li>
+ <li>intel: don't call unmap pbo if pbo is not mapped</li>
+</ul></p>
+
+</body>
+</html>
diff --git a/mesalib/docs/relnotes-7.11.html b/mesalib/docs/relnotes-7.11.html
index c81ac9f15..52033cf1e 100644
--- a/mesalib/docs/relnotes-7.11.html
+++ b/mesalib/docs/relnotes-7.11.html
@@ -10,7 +10,7 @@
<body bgcolor="#eeeeee">
-<H1>Mesa 7.11 Release Notes / (release date TBD)</H1>
+<H1>Mesa 7.11 Release Notes / July 31, 2011</H1>
<p>
Mesa 7.11 is a new development release.
@@ -30,7 +30,12 @@ for DRI hardware acceleration.
<h2>MD5 checksums</h2>
<pre>
-tbd
+fa2c7068503133fb2453244cda11cb2a MesaLib-7.11.tar.gz
+ff03aca82d0560009a076a87c888cf13 MesaLib-7.11.tar.bz2
+ede1ac0976f6f05df586093fc17d63ed MesaLib-7.11.zip
+b4fb81a47c5caedaefad49af7702c23d MesaGLUT-7.11.tar.gz
+77a9a0bbd7f8bca882aa5709b88cb071 MesaGLUT-7.11.tar.bz2
+c19ef0c6eb61188c96ed4ccedd70717c MesaGLUT-7.11.zip
</pre>
@@ -64,11 +69,263 @@ tbd
<li>GL_ATI_texture_float (gallium, i965)
<li>GL_NV_conditional_render (i965)
<li>GL_NV_texture_barrier (gallium drivers)
+<li>Enable 16-wide fragment shader execution in i965 driver. This should improve performance in many applications.
+<li>Initial alpha-level support for Intel "Ivybridge" chipsets in the i965 driver.
</ul>
<h2>Bug fixes</h2>
+
+<p>This list is likely incomplete. This list only includes bug fixes not
+included in the previous release (7.10.3). Many of these are regressions that
+did not exist in the 7.10 release series at all.</p>
+
<ul>
+<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=25871">Bug 25871</a> - nearest neighbour samples wrong texel (precision/rounding problem)</li>
+
+<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=29162">Bug 29162</a> - mesa/darwin is severly broken</li>
+
+<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=30080">Bug 30080</a> - [i915] piglit nodepth-test fails</li>
+
+<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=30217">Bug 30217</a> - Possible sources of memory leaks reported by valgrind</li>
+
+<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=30266">Bug 30266</a> - Regression, segfault in libdrm_intel when calling glBitmap</li>
+
+<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=31561">Bug 31561</a> - [i915] intel_regions.c:289: intel_region_release: Assertion `region-&gt;map_refcount == 0' failed.</li>
+
+<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=31744">Bug 31744</a> - [GLSL] overriding built-in function impacts another shader</li>
+
+<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=32308">Bug 32308</a> - [llvmpipe] src/gallium/auxiliary/gallivm/lp_bld_init.c:319:gallivm_register_garbage_collector_callback: Assertion `NumCallbacks &lt; 32' failed.</li>
+
+<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=32309">Bug 32309</a> - [softpipe] SIGSEGV sp_state_derived.c:204</li>
+
+<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=32459">Bug 32459</a> - [softpipe] glean depthStencil regression</li>
+
+<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=32460">Bug 32460</a> - [softpipe] piglit texwrap 1D regression</li>
+
+<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=32534">Bug 32534</a> - [arrandale/sandybridge] Mesa swallowing GEM ioctl failures</li>
+
+<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=32560">Bug 32560</a> - To fix: 64-bit-portabilty-issue state_tracker/st_program.c:427</li>
+
+<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=32634">Bug 32634</a> - [r300g, bisected] Massive corruption in Unigine Sanctuary</li>
+
+<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=32768">Bug 32768</a> - VBO rendering using glDrawArrays causes program termination and "cs IB too big" message</li>
+
+<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=32804">Bug 32804</a> - [swrast] glean pixelFormats regression</li>
+
+<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=32814">Bug 32814</a> - Build error in osmesa.c due to change in _mesa_update_framebuffer_visual() signature</li>
+
+<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=32859">Bug 32859</a> - Mesa doesn't compile under NetBSD</li>
+
+<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=32912">Bug 32912</a> - [bisected, r300g] Unigine Sanctuary: r300_emit.c:902:r300_emit_vertex_arrays: Assertion `&amp;buf-&gt;b.b' failed with RADEON_HYPERZ=1</li>
+
+<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=32945">Bug 32945</a> - [RADEON:KMS:R300G] HiZ: Weird behavior with 3 pipes</li>
+
+<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=33046">Bug 33046</a> - [bisected]glean/pixelFormats and 3 oglc cases segfault</li>
+
+<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=33185">Bug 33185</a> - [RADEON:KMS:R300G] X crashes when kwin effects are turned on</li>
+
+<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=33215">Bug 33215</a> - [llvmpipe] piglit fbo-drawbuffers2-blend regression</li>
+
+<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=33247">Bug 33247</a> - [swrast] tnl/t_draw.c:471: _tnl_draw_prims: Assertion `prim[i].num_instances &gt; 0' failed</li>
+
+<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=33284">Bug 33284</a> - [llvmpipe] piglit fbo-drawbuffers-fragcolor fails</li>
+
+<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=33306">Bug 33306</a> - [glsl] GLSL integer division by zero crashes GLSL compiler</li>
+
+<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=33353">Bug 33353</a> - [softpipe] piglit fbo-srgb looks incorrect</li>
+
+<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=33360">Bug 33360</a> - inclusion of $(TALLOC_LIBS) in src/mesa/drivers/osmesa/Makefile causes a build failure</li>
+
+<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=33374">Bug 33374</a> - [bisect] FTBFS on commit 9767d3b5 (glapi: Fix OpenGL ES 1.1 and 2.0 interop)</li>
+
+<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=33508">Bug 33508</a> - [glsl] GLSL compiler modulus by zero crash</li>
+
+<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=33555">Bug 33555</a> - [softpipe] tgsi/tgsi_sse2.c:1527:emit_tex: Assertion `0' failed.</li>
+
+<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=33885">Bug 33885</a> - [glsl] GLSL compiler allows recursion</li>
+
+<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=33823">Bug 33823</a> - [glsl] ralloc.c:78: get_header: Assertion `info-&gt;canary == 0x5A1106' failed.</li>
+
+<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=33934">Bug 33934</a> - 3D blitting is orders of magnitude slower than equivalent 2D blitting.</li>
+
+<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=33946">Bug 33946</a> - Crash: Mesa checks for invalid pointer, then uses it anyway.</li>
+
+<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=34008">Bug 34008</a> - r600g: piglit failure (regression)</li>
+
+<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=34009">Bug 34009</a> - Automatic Mipmap Generation produces very blurry image.</li>
+<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=34042">Bug 34042</a> - Surfaceless eglMakeCurrent() fails if the supplied EGLContext is not a dummy context</li>
+
+<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=34049">Bug 34049</a> - r600g: assertion failure (regression)</li>
+
+<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=34119">Bug 34119</a> - [glsl] piglit glsl-texcoord-array regression</li>
+
+<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=34323">Bug 34323</a> - [i915 GLSL gles2] gl_FragCoord.w not correct</li>
+
+<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=34346">Bug 34346</a> - src/glsl relies on $PWD which can be unset</li>
+
+<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=34378">Bug 34378</a> - st/mesa: 2a904fd6a0cb80eec6dec2bae07fd8778b04caf3 breaks sauerbraten</li>
+
+<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=34419">Bug 34419</a> - Kwin crashes screensaver exits</li>
+
+<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=34463">Bug 34463</a> - state_tracker/st_texture.c:370:st_texture_image_copy: Assertion `u_minify(src-&gt;width0, srcLevel) == width' failed.</li>
+
+<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=34468">Bug 34468</a> - src/glsl/Makefile fix</li>
+
+<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=34541">Bug 34541</a> - [ilk, wine] massive render corruption after recent patchset</li>
+
+<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=34589">Bug 34589</a> - [pineview bisected]many cases regression</li>
+
+<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=34595">Bug 34595</a> - [bisected piketon]oglc half_float_vertex(misc.fillmode.wireframe) regressed</li>
+
+<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=34597">Bug 34597</a> - [bisected piketon]oglc blend-constcolor and 7 draw-buffers2 subcases regressed</li>
+
+<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=34603">Bug 34603</a> - [bisected piketon]oglc vbo subcase basic.bufferdata regressed</li>
+
+<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=34604">Bug 34604</a> - [bisected piketon]piglit fbo/fbo-depth-sample-compare regressed</li>
+
+<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=34646">Bug 34646</a> - [bisected piketon]ogles2conform GL2Tests/GL/gl_FragCoord/gl_FragCoord_w_frag.test</li>
+
+<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=34656">Bug 34656</a> - i965: Crash when running WebGL Conformance Test in firefox-4 nightly build</li>
+
+<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=34691">Bug 34691</a> - [GLSL] matrix array member assignment with a complex subscript fails</li>
+
+<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=34906">Bug 34906</a> - [Pineview] Some WebGL conformance tests will crash firefox</li>
+
+<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=34968">Bug 34968</a> - Bad fps in Lightsmark benchmark</li>
+
+<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=35025">Bug 35025</a> - [Patch] Serious compiler warnings</li>
+
+<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=35312">Bug 35312</a> - r600g: Automatic mipmap generation doesn't work properly</li>
+
+<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=35373">Bug 35373</a> - [[GM45] OpenGL] GL_EXT_texture_sRGB_decode broken</li>
+
+<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=35434">Bug 35434</a> - [RADEON:KMS:R600G] etqw: broken ground textures</li>
+
+<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=35441">Bug 35441</a> - [PATCH] Mesa does not find nouveau include files with --enable-shared-dricore</li>
+
+<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=35614">Bug 35614</a> - [SNB] random hang on piglit case shaders/glsl-max-varyings</li>
+
+<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=35820">Bug 35820</a> - [bisected SNB] System hangs when Gnome with compiz start up</li>
+
+<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=35822">Bug 35822</a> - [bisected pineview] many cases related to depth and stencil failed</li>
+
+<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=35849">Bug 35849</a> - when sampling textures from both fragment and vertex shaders the vertex texture has the incorrect texture bound</li>
+
+<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=35852">Bug 35852</a> - [bisected pineview] oglc case pxconv-read failed</li>
+
+<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=35961">Bug 35961</a> - src/gallium/auxiliary/util/u_draw.c:77:util_draw_max_index: Assertion `buffer_size - format_size &lt;= buffer_size' failed.</li>
+
+<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=36032">Bug 36032</a> - piglit fdo9833 regression</li>
+
+<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=36033">Bug 36033</a> - main/shaderapi.c:1044: validate_samplers: Assertion `(sizeof(targetName)/sizeof(*(targetName))) == NUM_TEXTURE_TARGETS' failed.</li>
+
+<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=36086">Bug 36086</a> - [wine] Segfault r300_resource_copy_region with some wine apps and RADEON_HYPERZ</li>
+
+<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=36182">Bug 36182</a> - Game Trine from http://www.humblebundle.com/ needs ATI_draw_buffers</li>
+
+<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=36268">Bug 36268</a> - [r300g, bisected] minor flickering in Unigine Sanctuary</li>
+
+<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=36282">Bug 36282</a> - 34a5d3b9f4740601708c82093e2114356d749e65: glxgears segfaults when compiled with shared glapi</li>
+
+<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=36333">Bug 36333</a> - can't build demos if mesa build with --enable-selinux</li>
+
+<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=36473">Bug 36473</a> - [bisected] piglit bugs/fdo23670-depth_test failed</li>
+
+<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=36572">Bug 36572</a> - [bisected]oglc case texenv segfaults</li>
+
+<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=36609">Bug 36609</a> - 45920d2ecb38b14fdda5253fecce996570c22863 breaks sauerbraten on r300g</li>
+
+<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=36648">Bug 36648</a> - [bisected SNB]piglit fbo/fbo-alphatest-nocolor failed</li>
+
+<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=36649">Bug 36649</a> - [bisected SNB]oglc draw-buffers2 failed with 16-wide</li>
+
+<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=36753">Bug 36753</a> - Some textures now rendered as completely black after register allocator rewrite.</li>
+
+<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=36821">Bug 36821</a> - [bisected SNB]oglc api-texcoord causes GPU hang</li>
+
+<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=36914">Bug 36914</a> - r600g: add rv670 flushing workaround. Causes games and some mesa demos to segfault.</li>
+
+<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=36917">Bug 36917</a> - Rendering glitches in ETQW</li>
+
+<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=36939">Bug 36939</a> - multitexturing is messed up in quake wars (regression)</li>
+
+<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=36987">Bug 36987</a> - Intel GMA 4500 ARB_shader_texture_lod support</li>
+
+<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=37028">Bug 37028</a> - Amnesia/HPL2 Demo: Strange graphical bugs on r600g</li>
+
+<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=37150">Bug 37150</a> - sRGB textures are too bright in Starcraft 2</li>
+
+<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=37154">Bug 37154</a> - main/texstore.c:4187: _mesa_texstore_rgb9_e5: Assertion `baseInternalFormat == 0x1907' failed.</li>
+
+<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=37157">Bug 37157</a> - [bisected] KDE KWin crashes on start with delayed BO mapping</li>
+
+<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=37168">Bug 37168</a> - Regression: Severe memory leak when running Second Life</li>
+
+<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=37366">Bug 37366</a> - [i965 bisected ILK] Fragment shader discard tests occasionally fail</li>
+
+<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=37383">Bug 37383</a> - incorrect GLSL optimization</li>
+
+<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=37476">Bug 37476</a> - [wine] Devil May Cry 4: TXD tgsi opcode unsupported / translation from TGSI failed / missing vertex shader</li>
+
+<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=37743">Bug 37743</a> - [bisected i965]oglc GLSLlinker subcase negative.varying.beyondMaxVaryingFloats aborted</li>
+
+<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=37766">Bug 37766</a> - Crash in dri2InvalidateBuffers when resizing Java window with OpenGL pipeline enabled</li>
+
+<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=37839">Bug 37839</a> - main/teximage.c:2393: _mesa_choose_texture_format: Assertion `f != MESA_FORMAT_NONE' failed.</li>
+
+<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=37934">Bug 37934</a> - Corruption with topogun trace</li>
+
+<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=38015">Bug 38015</a> - Some extensions enabled even when not supported by the underlying driver</li>
+
+<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=38134">Bug 38134</a> - [bisected i965]piglit fbo/fbo-blit-d24s8 crashed</li>
+
+<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=38145">Bug 38145</a> - r600g/evergreen: Incorrect rendering of some effects in doom3</li>
+
+<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=38440">Bug 38440</a> - ETQW: Model in team select rendering too bright</li>
+
+<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=38566">Bug 38566</a> - [regression] ETQW crashes with 21972c85ea734dbfcf69629c6b0b940efb42d4ba</li>
+
+<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=38584">Bug 38584</a> - MESA_GLSL=dump causes SEGV in ir_print_visitor::unique_name</li>
+
+<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=38599">Bug 38599</a> - THe value of WGL_PBUFFER_HEIGHT_ARB is returned as width in wglQueryPbufferARB</li>
+
+<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=38602">Bug 38602</a> - [bisected] Wrong display after "prefer native texture formats when possible" commit</li>
+
+<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=38624">Bug 38624</a> - program/ir_to_mesa.cpp:1440: virtual void ir_to_mesa_visitor::visit(ir_dereference_variable*): Assertion `var-&gt;location != -1' failed.</li>
+
+<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=38626">Bug 38626</a> - vbo: Don't discount stride breaks piglit on softpipe/r600g</li>
+
+<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=38649">Bug 38649</a> - piglit fbo-copyteximage regression</li>
+
+<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=38762">Bug 38762</a> - [IVB bisected]3D demos like glxgears abort</li>
+
+<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=38771">Bug 38771</a> - [[GM45] DRI] GPU hangs with current Mesa GIT when running certain OpenGL applications</li>
+
+<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=38842">Bug 38842</a> - Various valid GLX attributes are rejected by MESA glxChooseFBConfig</li>
+
+<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=38971">Bug 38971</a> - [bisected]oglc glsl-autointconv subcase negative.function.ambiguousMatch failed</li>
+
+<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=38987">Bug 38987</a> - sampler allowed as non-uniform / non-function parameters</li>
+
+<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=39024">Bug 39024</a> - [Pineview webgl] many webgl conformance cases crash the browser</li>
+
+<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=39083">Bug 39083</a> - [regression, bisected, r600g] Wrong rendering of Bubbles3D screensaver</li>
+
+<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=39119">Bug 39119</a> - setting SQ_LDS_RESOURCE_MGMT register to zero in other applications muddles up font rendering permanently</li>
+
+<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=39209">Bug 39209</a> - [bisected] Wrong display after "prefer native texture formats when possible" commit - part2</li>
+
+<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=39219">Bug 39219</a> - libgl conflict with xbmc causes lock up on xbmc exit</li>
+
+<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=39257">Bug 39257</a> - [bisected SNB]Mesa demos engine causes GPU hang</li>
+
+<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=39487">Bug 39487</a> - [i965] brw_wm_surface_state.c:495: brw_update_renderbuffer_surface: Assertion `brw-&gt>has_surface_tile_offset || (tile_x == 0 &amp;&amp; tile_y == 0)' failed.</li>
+
+<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=39515">Bug 39515</a> - FTBFS: libEGL depends on libgbm, but libEGL builds first</li>
+
+<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=39572">Bug 39572</a> - Cogs: GPU hang</li>
+
</ul>
@@ -81,6 +338,11 @@ Building with SCons is an alternative.
driver that implemented it.
</ul>
+<p>The full set of changes can be viewed by using the following GIT command:</p>
+
+<pre>
+ git log mesa-7.10..mesa-7.11
+</pre>
</body>
</html>
diff --git a/xorg-server/xkeyboard-config/rules/base.o_s.part b/xorg-server/xkeyboard-config/rules/base.o_s.part
index 6cf9f1406..e1188ba34 100644
--- a/xorg-server/xkeyboard-config/rules/base.o_s.part
+++ b/xorg-server/xkeyboard-config/rules/base.o_s.part
@@ -103,6 +103,7 @@
nbsp:level4n = +nbsp(level4n)
nbsp:level4nl = +nbsp(level4nl)
japan:nicola_f_bs = +jp(nicola_f_bs)
+ japan:hztg_escape = +jp(hztg_escape)
kpdl:dot = +kpdl(dot)
kpdl:comma = +kpdl(comma)
kpdl:dotoss = +kpdl(dotoss)
diff --git a/xorg-server/xkeyboard-config/rules/base.xml.in b/xorg-server/xkeyboard-config/rules/base.xml.in
index 5279521a6..8816034a3 100644
--- a/xorg-server/xkeyboard-config/rules/base.xml.in
+++ b/xorg-server/xkeyboard-config/rules/base.xml.in
@@ -4779,6 +4779,7 @@
<_description>Taiwanese</_description>
<languageList>
<iso639Id>trv</iso639Id>
+ <iso639Id>pwn</iso639Id>
</languageList>
</configItem>
<variantList>
@@ -6498,6 +6499,12 @@
<_description>NICOLA-F style Backspace</_description>
</configItem>
</option>
+ <option>
+ <configItem>
+ <name>japan:hztg_escape</name>
+ <_description>Make Zenkaku Hankaku an additional ESC</_description>
+ </configItem>
+ </option>
</group>
<group allowMultipleSelection="false">
<configItem>
diff --git a/xorg-server/xkeyboard-config/symbols/jp b/xorg-server/xkeyboard-config/symbols/jp
index 30658834f..a80e02372 100644
--- a/xorg-server/xkeyboard-config/symbols/jp
+++ b/xorg-server/xkeyboard-config/symbols/jp
@@ -246,3 +246,9 @@ xkb_symbols "mac" {
replace key <CAPS> { [ Caps_Lock ] };
};
+
+partial alphanumeric_keys
+xkb_symbols "hztg_escape" {
+ replace key <HZTG> { [ Escape ] };
+};
+
diff --git a/xorg-server/xkeyboard-config/symbols/tw b/xorg-server/xkeyboard-config/symbols/tw
index 561cb029a..b98e21ed3 100644
--- a/xorg-server/xkeyboard-config/symbols/tw
+++ b/xorg-server/xkeyboard-config/symbols/tw
@@ -34,6 +34,7 @@ xkb_symbols "tw" {
key <AC02> { [ s, S, ssharp, NoSymbol ] };
key <AC03> { [ d, D, U1E0F, U1E0E ] };
key <AC05> { [ g, G, eng, ENG ] };
+ key <AC09> { [ l, L, U1E3B, U1E3A ] };
key <AC10> { [ semicolon, colon, U02D0, dead_diaeresis ] };
key <AC11> { [apostrophe, quotedbl, U02BC, dead_doubleacute ] };