summaryrefslogtreecommitdiff
path: root/src
AgeCommit message (Collapse)AuthorFilesLines
2013-11-15tests: Fix make check for out of tree builds.Rico Schüller2-0/+2
Cc: "10.0" <mesa-stable@lists.freedesktop.org> Reviewed-by: Matt Turner <mattst88@gmail.com> Signed-off-by: Rico Schüller <kgbricola@web.de> (cherry picked from commit 23afe71f444067cad927273728529ff15ba394df)
2013-11-15osmesa: fix broken triangle/line drawing when using float color bufferBrian Paul1-0/+16
Doesn't seem to help with bug 71363 but it fixed a failure I found in my testing. Cc: "9.2" <mesa-stable@lists.freedesktop.org> Cc: "10.0" <mesa-stable@lists.freedesktop.org> (cherry picked from commit a66a008b17872f3eab91b7d04dd70e4537bdb627)
2013-11-15i965: convert brw_lower_offset_array_visitor to ir_rvalue_visitorChris Forbes1-7/+11
Previously, we would bogusly replace the entire statement containing the ir_texture node with an ir_dereference_variable. Correct this to just replace the ir_texture node itself as intended. Signed-off-by: Chris Forbes <chrisf@ijw.co.nz> Reviewed-by: Kenneth Graunke <kenneth@whitecape.org> (cherry picked from commit 5442c0eae3a639d0c9daf447cdfecdbafb475658)
2013-11-15glsl: fix missing breaks in equals(ir_texture,..)Chris Forbes1-0/+2
Signed-off-by: Chris Forbes <chrisf@ijw.co.nz> Cc: "10.0" <mesa-stable@lists.freedesktop.org> Reviewed-by: Kenneth Graunke <kenneth@whitecape.org> (cherry picked from commit d257350949440539cb4c3c20349da7f1d5afb693)
2013-11-15i965/fs: Don't perform CSE on inst HW_REG dests (unless it's null)Matt Turner1-1/+2
Commit b16b3c87 began performing CSE on CMP instructions with null destinations. I relaxed the restrictions a bit too much, thereby allowing CSE to be performed on instructions with, for instance, an explicit accumulator destination. This broke the arb_gpu_shader5/fs-imulExtended shader tests because they emit MUL instructions with the accumulator as the destination. CSE would instead cause the MUL to write to a GRF, which is lower precision than the accumulator. Reviewed-by: Eric Anholt <eric@anholt.net> Cc: 10.0 <mesa-stable@lists.freedesktop.org> (cherry picked from commit 68349e52194b7eba521b88d42ee8db3bfdf0a877)
2013-11-15glx: Back DRI3 enablement out of the stable branch.Eric Anholt2-4/+0
After more testing (everyone else trying to build the stack is having as much trouble as I had, even after the problems I had were fixed), it really feels like dri3 is not something we're ready to support in this stable branch. The .c/.h code will remain here to enable easier cherry-picking from master, and everything stays on master so we can ship a solid DRI3 in 3 months. Reviewed-by: Ian Romanick <ian.d.romanick@intel.com> Reviewed-by: Brian Paul <brianp@vmware.com>
2013-11-15glx: change query_renderer_integer() value param to unsignedBrian Paul3-3/+4
When this function was added, the returned value was signed in some places, unsigned in others. v2: also add unsigned in the unit test, per Ian. Reviewed-by: Ian Romanick <ian.d.romanick@intel.com> (cherry picked from commit 75982a5df42cd2406e529b7c96b36d2a8b1f7b60)
2013-11-15glx: Fix scons build.José Fonseca1-0/+3
Reviewed-by: Brian Paul <brianp@vmware.com> (cherry picked from commit 6c6f4aa6fdad19574406ea7edcbcca45d02e89b6)
2013-11-15swrast: add missing notify_reset parameter to dri_create_context()Brian Paul1-0/+1
Reviewed-by: Jose Fonseca <jfonseca@vmware.com> (cherry picked from commit f41c01c68847a2d3df8f3c8786ef803428a0be13)
2013-11-15scons: Add dri2_query_renderer.c to sources.José Fonseca1-0/+1
(cherry picked from commit cb3c57df3acfa237641aa004545a786f5624f198)
2013-11-15st/dri: Fix dri_create_context declaration prototype.José Fonseca1-0/+1
(cherry picked from commit caf1d96862553b169aa9d8fac63fcbd37a59d099)
2013-11-14haiku/swrast: Inherit gl_config, fix flushAlexander von Gluck IV2-37/+26
* Inherit gl_context so we always have access to it * Thanks curro for the idea. * Last Haiku cannidate for 10.0.0 Reviewed-by: Francisco Jerez <currojerez@riseup.net>
2013-11-13haiku: add swrast driverAlexander von Gluck IV5-0/+873
* This is pretty small and upkeep should be minimal. * Currently fully working. * Cannidate for 10.0.0 branch Acked-by: Brian Paul <brianp@vmware.com>
2013-11-07dri3: Fix pixmap buf_id computation10.0-branchpointKeith Packard1-1/+1
Looks like some kind of rebase damage to me... Signed-off-by: Keith Packard <keithp@keithp.com> Reviewed-by: Eric Anholt <eric@anholt.net>
2013-11-07glx: Add a more informative debug message in a DRI3 error path.Eric Anholt1-0/+7
2013-11-07Add DRI3+Present loaderKeith Packard6-1/+2195
Uses the __DRIimage loader interfaces. v2: Fix _XIOErrors when DRI3 isn't present (change by anholt). Apparently XCB just terminates your connection if you don't check for extensions before using them, instead of returning an error like you'd expect. Signed-off-by: Keith Packard <keithp@keithp.com> Reviewed-by: Kristian Høgsberg <krh@bitplanet.net> Reviewed-by: Eric Anholt <eric@anholt.net>
2013-11-07dri: add __DRIimageLoaderExtension and __DRIimageDriverExtensionKeith Packard11-11/+352
These provide an interface between the driver and the loader to allocate color buffers through the DRIimage extension interface rather than through a loader-specific extension (as is used by DRI2, for instance). The driver uses the loader 'getBuffers' interface to allocate color buffers. The loader uses the createNewScreen2, createNewDrawable, createNewContext, getAPIMask and createContextAttribs APIS (mostly shared with DRI2). This interface will work with the DRI3 loader, and should also work with GBM and other loaders so that drivers need not be customized for each new loader interface, as long as they provide this image interface. v2: Fix build of i915 and i965 together (by anholt) Signed-off-by: Keith Packard <keithp@keithp.com> Reviewed-by: Kristian Høgsberg <krh@bitplanet.net> Reviewed-by: Eric Anholt <eric@anholt.net>
2013-11-07dri/i915,dri/i965: Use driGLFormatToImageFormat and driImageFormatToGLFormatKeith Packard2-108/+8
Remove private versions of these functions Signed-off-by: Keith Packard <keithp@keithp.com> Reviewed-by: Jordan Justen <jordan.l.justen@intel.com> Reviewed-by: Kristian Høgsberg <krh@bitplanet.net>
2013-11-07dri/common: Add functions mapping MESA_FORMAT_* <-> __DRI_IMAGE_FORMAT_*Keith Packard2-0/+68
The __DRI_IMAGE_FORMAT codes are used by the image extension, drivers need to be able to translate between them. Instead of duplicating this translation in each driver, create a shared version. Signed-off-by: Keith Packard <keithp@keithp.com> Reviewed-by: Jordan Justen <jordan.l.justen@intel.com> Reviewed-by: Kristian Høgsberg <krh@bitplanet.net>
2013-11-07dri/intel: Add explicit size parameter to intel_region_alloc_for_fdKeith Packard6-9/+10
Instead of assuming that the size will be height * pitch, have the caller pass in the size explicitly. Signed-off-by: Keith Packard <keithp@keithp.com> Reviewed-by: Jordan Justen <jordan.l.justen@intel.com> Reviewed-by: Kristian Høgsberg <krh@bitplanet.net>
2013-11-07dri/intel: Split out DRI2 buffer update code to separate functionKeith Packard2-44/+68
Make an easy place to splice in a DRI3 version of this function Signed-off-by: Keith Packard <keithp@keithp.com> Reviewed-by: Kristian Høgsberg <krh@bitplanet.net> Reviewed-by: Jordan Justen <jordan.l.justen@intel.com>
2013-11-07drivers/dri/common: A few dri2 functions are not actually DRI2 specificKeith Packard1-37/+37
This just renames them so that they can be used with the DRI3 extension without causing too much confusion. Signed-off-by: Keith Packard <keithp@keithp.com> Reviewed-by: Kristian Høgsberg <krh@bitplanet.net> Reviewed-by: Jordan Justen <jordan.l.justen@intel.com>
2013-11-08gallivm: deduplicate some indirect register address codeRoland Scheidegger1-157/+96
There's only one minor functional change, for immediates the pixel offsets are no longer added since the values are all the same for all elements in any case (it might be better if those weren't stored as soa vectors in the first place maybe). Reviewed-by: Zack Rusin <zackr@vmware.com>
2013-11-07glx/tests: Add unit tests for the DRI2 part of GLX_MESA_query_rendererIan Romanick3-6/+314
After adding $(DEFINES) to AM_CPPFLAGS, the __glXGetCurrentContext wrapper function is no longer needed and causes compile errors. Using the correct defines causes it to be a macro! Signed-off-by: Ian Romanick <ian.d.romanick@intel.com>
2013-11-07glx/tests: Add unit tests for the GLX part of GLX_MESA_query_rendererIan Romanick3-1/+449
These tests primarilly ensure that the functions added by this extension don't abuse other interfaces (e.g., glx_screen::query_renderer_integer) when provided bad data. These tests helped me find a couple small bugs in the initial implementation. Signed-off-by: Ian Romanick <ian.d.romanick@intel.com>
2013-11-07glx/tests: Add GetGLXScreenConfigs_called flagIan Romanick1-0/+4
Tests for the GLX_MESA_query_context extension will use this flag. Signed-off-by: Ian Romanick <ian.d.romanick@intel.com>
2013-11-07glx/dri2: Add DRI2 support for GLX_MESA_query_rendererIan Romanick5-1/+119
The new functions for this extension were added to a separate file (dri2_query_renderer.c) to facilitate unit testing. I tried putting them in dri2_glx.c, and it resulting in an unending chain of dependencies. It was the proverbial threading hanging from a sweater. Signed-off-by: Ian Romanick <ian.d.romanick@intel.com> Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
2013-11-07glx/dri2: Pull some internal structures out to a separate header fileIan Romanick2-20/+52
This structures will be accessed by internal functions that will be added in a file separate from dri2_glx.c. The new code will be added to a new file to facilitate unit testing. Signed-off-by: Ian Romanick <ian.d.romanick@intel.com> Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
2013-11-07glx/tests: Silence warnings after adding fields to glx_screen_vtableIan Romanick1-2/+6
Signed-off-by: Ian Romanick <ian.d.romanick@intel.com>
2013-11-07glx: Add functions and GLX plumbing for GLX_MESA_query_rendererIan Romanick4-1/+186
Signed-off-by: Ian Romanick <ian.d.romanick@intel.com> Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
2013-11-07glx: Add extension tracking GLX_MESA_query_rendererIan Romanick2-0/+2
Signed-off-by: Ian Romanick <ian.d.romanick@intel.com> Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
2013-11-07i965: Wire up initial support for DRI_RENDERER_QUERY extensionIan Romanick1-0/+83
v2: Use sysconf instead of sysinfo for improved portability. Suggested by Ken. Signed-off-by: Ian Romanick <ian.d.romanick@intel.com> Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
2013-11-07i915: Wire up initial support for DRI_RENDERER_QUERY extensionIan Romanick1-0/+81
v2: Use sysconf instead of sysinfo for improved portability. Suggested by Ken. Signed-off-by: Ian Romanick <ian.d.romanick@intel.com> Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
2013-11-07dri: Add function to implement queries common to all Mesa driversIan Romanick2-0/+67
v2: Add assertions that the version string has the expected format. This will catch build errors (or changes to the version string format) in debug build without exposing release builds to buffer over-runs. Suggested by Ken. Signed-off-by: Ian Romanick <ian.d.romanick@intel.com> Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
2013-11-07i965: Refactor the renderer string creation out of intelGetStringIan Romanick2-13/+23
This will soon be used in intel_screen.c from a function that doesn't have a gl_context. v2: Delete local variables that are now unused. This matches v1 of the changes to the i915 driver. Signed-off-by: Ian Romanick <ian.d.romanick@intel.com> Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
2013-11-07i915: Refactor the renderer string creation out of intelGetStringIan Romanick2-13/+23
This will soon be used in intel_screen.c from a function that doesn't have a gl_context. Signed-off-by: Ian Romanick <ian.d.romanick@intel.com> Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
2013-11-07i965: Refactor the vendor string out of intelGetStringIan Romanick2-2/+5
This will soon be used in intel_screen.c from a function that doesn't have a gl_context. Signed-off-by: Ian Romanick <ian.d.romanick@intel.com> Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
2013-11-07i915: Refactor the vendor string out of intelGetStringIan Romanick2-2/+4
This will soon be used in intel_screen.c from a function that doesn't have a gl_context. v2: Remove spurious break after return. Signed-off-by: Ian Romanick <ian.d.romanick@intel.com> Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
2013-11-07i965: Enable DRI_Robustness extensionIan Romanick1-0/+5
Signed-off-by: Ian Romanick <ian.d.romanick@intel.com> Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
2013-11-07i965: Propagate the GPU reset notifiction strategy down into the driverIan Romanick2-5/+29
If the application requests reset notifiction, connect up the reset status query method and set gl_context::ResetStrategy. v2: Update based on kernel interface / libdrm changes. Signed-off-by: Ian Romanick <ian.d.romanick@intel.com> Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
2013-11-07i965: Add function to query the GPU reset status for a contextIan Romanick3-0/+71
v2: Update based on kernel interface / libdrm changes. Signed-off-by: Ian Romanick <ian.d.romanick@intel.com> Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
2013-11-07i965: Handle __DRI_CTX_FLAG_ROBUST_BUFFER_ACCESS flagIan Romanick1-1/+6
Signed-off-by: Ian Romanick <ian.d.romanick@intel.com> Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
2013-11-07mesa/dri: Move context flag validation down into the driversIan Romanick6-9/+27
Soon some drivers will support a different set of flags than other drivers. If some flags have to be filtered in the driver, we might as well filter all of them in the driver. The changes in nouveau use tabs because nouveau seems to have it's own indentation rules. v2: Fix some rebase failures noticed by Ken (returning the wrong types, etc.). Signed-off-by: Ian Romanick <ian.d.romanick@intel.com> Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
2013-11-07mesa/dri: Add basic plumbing for GLX_ARB_robustness reset notification strategyIan Romanick12-2/+49
No drivers advertise the DRI2 extension yet, so no driver should ever see a value other than false for notify_reset. The changes in nouveau use tabs because nouveau seems to have it's own indentation rules. Signed-off-by: Ian Romanick <ian.d.romanick@intel.com> Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
2013-11-07mesa: Implement proper tracking logic for glGetGraphicsResetStatusARBIan Romanick1-4/+43
Drivers still have to implement dd_function_table::GetGraphicsResetStatus. Signed-off-by: Ian Romanick <ian.d.romanick@intel.com> Reviewed-by: Brian Paul <brianp@vmware.com>
2013-11-07mesa: Add gl_shared_state::ShareGroupReset and gl_context::ShareGroupResetIan Romanick2-0/+20
These will be used to determine whether to signal a GPU reset after another context in the share group has observed a reset. v2: Change ShareGroupReset from GLboolean to bool. Suggested by Brian. Signed-off-by: Ian Romanick <ian.d.romanick@intel.com> Reviewed-by: Brian Paul <brianp@vmware.com>
2013-11-07mesa: Add dd_function_table::GetGraphicsResetStatusIan Romanick1-0/+9
This allows drivers to determine whether a GPU reset has occured. It should return non-zero status if a reset was observed by the specified context. Another mechanism will be used to observe resets occuring in other contexts in the share group. Signed-off-by: Ian Romanick <ian.d.romanick@intel.com> Reviewed-by: Brian Paul <brianp@vmware.com>
2013-11-07mesa: Remove gl_context::ResetStatusIan Romanick3-5/+1
This isn't going to be used in the actual implemenation of glGetGraphicsResetStatus. Signed-off-by: Ian Romanick <ian.d.romanick@intel.com> Reviewed-by: Brian Paul <brianp@vmware.com>
2013-11-07st/xorg: Delete.Matt Turner22-7080/+0
Acked-by: Lucas Stach <l.stach@pengutronix.de>
2013-11-07xorg-nouveau: Delete.Matt Turner4-284/+0