00978098794f723230a33cab1c1152686f1c4fa5 |
31-Aug-2012 |
Jakob Bornecrantz <jakob@vmware.com> |
dri: Rework planar image interface As discussed with Kristian on #wayland. Pushes the decision of components into the dri driver giving it greater freedom to allow t to implement YUV samplers in hardware, and which mode to use. This interface will also allow drivers like SVGA to implement YUV surfaces without the need to sub-allocate and instead send 3 seperate buffers for each channel, currently not implemented. I have tested these changes on Gallium Svga. Scott tested them on both intel and Gallium Radeon. Kristan and Pekka tested them on intel. v2: Fix typo in dri2_from_planar. v3: Merge in intel changes. (cherry picked from commit 6a7dea93fa70d670a5954e47a47075a2703209d4) Tested-by: Scott Moreau <oreaus@gmail.com> Tested-by: Pekka Paalanen <ppaalanen@gmail.com> Tested-by: Kristian Høgsberg <krh@bitplanet.net> Reviewed-by: Kristian Høgsberg <krh@bitplanet.net> Signed-off-by: Jakob Bornecrantz <jakob@vmware.com>
ommon/dri_screen.h
rm/dri2.c
|
33ee019422558d50033e02754d0a2a19ed9bf737 |
15-Aug-2012 |
Jakob Bornecrantz <jakob@vmware.com> |
st/dri: Support width and height getters Tested-by: Scott Moreau <oreaus@gmail.com> Signed-off-by: Jakob Bornecrantz <jakob@vmware.com>
rm/dri2.c
|
15effe1fabe9e47e680f9f9c12ea6b61acf97cd5 |
21-Aug-2012 |
Jakob Bornecrantz <jakob@vmware.com> |
st/dri: Claim to support validate_usage Support version 3 as well as 2, since that is only the new format query, which Jesse added support for to st/dri when he added it to dri_inteface.h. Tested-by: Scott Moreau <oreaus@gmail.com> Signed-off-by: Jakob Bornecrantz <jakob@vmware.com>
rm/dri2.c
|
68d6441930fa19e2414a4c273ddce15e0c71de99 |
12-Apr-2012 |
Vadim Girlin <vadimgirlin@gmail.com> |
st/dri: pass config options to the state tracker Signed-off-by: Vadim Girlin <vadimgirlin@gmail.com>
ommon/dri_context.c
|
44f69fc82518d343733c77905cf9b9963fe102e4 |
12-Apr-2012 |
Vadim Girlin <vadimgirlin@gmail.com> |
st/dri: add force_glsl_extensions_warn option to dri options Signed-off-by: Vadim Girlin <vadimgirlin@gmail.com>
ommon/dri_screen.c
|
e7c177ec9e37d0c406c3b0ef8f228159d7ee5d69 |
12-Apr-2012 |
Vadim Girlin <vadimgirlin@gmail.com> |
st/dri: use driver name for driconf section lookup The name is taken from the driver_descriptor, so it will be the same as expected by driconf utility. Signed-off-by: Vadim Girlin <vadimgirlin@gmail.com>
ommon/dri_context.c
|
c4610e9f927caa679f34f0d3135d7b1b8cb8bd29 |
14-Aug-2012 |
Jakob Bornecrantz <jakob@vmware.com> |
st/dri: Add shared usage on buffers created Tested-by: Scott Moreau <oreaus@gmail.com> Signed-off-by: Jakob Bornecrantz <jakob@vmware.com>
rm/dri2.c
|
a4bf68ca50da0ce291a464aec9b03a469ab2561a |
02-Aug-2012 |
Chad Versace <chad.versace@linux.intel.com> |
dri: Simplify use of driConcatConfigs If either argument to driConcatConfigs(a, b) is null or the empty list, then simply return the other argument as the resultant list. All callers were accomplishing that same behavior anyway. And each caller accopmplished it with the same pattern. So this patch moves that external pattern into the function. Reviewed-by: <eric@anholt.net> Signed-off-by: Chad Versace <chad.versace@linux.intel.com>
ommon/dri_screen.c
|
f80c2874eca86a12517fbe2f4c15287edfb4dc89 |
21-May-2012 |
Christoph Bumiller <e0425955@student.tuwien.ac.at> |
gallium: add st_api feature mask to prevent advertising MS visuals v2: use a define for the maximum sample count v3: also test odd sample counts (r300 supports MS3) While multisample renderbuffers are supported by mesa, MS visuals are not, so we need a way to tell dri/st not to advertise them even if the gallium driver does support multisampled surfaces. Otherwise applications selecting these non-functional visuals would run into trouble ... Reviewed-by: Brian Paul <brianp@vmware.com>
ommon/dri_screen.c
|
d6c5ad52b2473064f0b3e031a2e1b59480c68c43 |
22-Mar-2012 |
Dave Airlie <airlied@gmail.com> |
drisw: fix image stride calculation for 16-bit. If you ran g-s in 16-bpp we'd do a bunch of memory corruption. now it just misrenders for some other reasons. applies to stable. Signed-off-by: Dave Airlie <airlied@redhat.com> Reviewed-by: Brian Paul <brianp@vmware.com>
w/drisw.c
|
bed7b4aa5ff7bab39e9aafe9d78c4ec63f5631bc |
23-Feb-2012 |
Jakob Bornecrantz <jakob@vmware.com> |
st/dri: Fix crash in st/dri from dri format commit Introduced with 8de5c355fa2bf0f30df2c7cf39aee01e793284bf, it would probably just crash. Signed-off-by: Jakob Bornecrantz <jakob@vmware.com> Reviewed-by: Jesse Barnes <jbarnes@virtousgeek.org>
rm/dri2.c
|
8de5c355fa2bf0f30df2c7cf39aee01e793284bf |
21-Feb-2012 |
Jesse Barnes <jbarnes@virtuousgeek.org> |
gbm: track buffer format through DRI drivers GBM needs the buffer format in order to communicate with DRM and clients for things like scanout. So track the DRI format requested in the various back ends and use it to return the DRI format back to GBM when requested. GBM will then map this into the GBM surface type (which is in turn based on the DRM fb format list). Signed-off-by: Jesse Barnes <jbarnes@virtuousgeek.org>
ommon/dri_screen.h
rm/dri2.c
|
0fcc518964223d9baaa2b45e80afeb800beb872f |
01-Feb-2012 |
Ville Syrjala <syrjala@sci.fi> |
gallium/dri: Handle xserver that doesn't send needless DRI2 invalidate events Ever since xserver commit 531869448d07e00ae241120b59f3aaaa5709d59c, the server no longer sends invalidate events to clients, unless they have performed a GetBuffers request since the drawable was last invalidated. If the drawable gets invalidated immediately after the GetBuffers request was processed by the X server, it's possible that Xlib will process the invalidate event while waiting for the GetBuffers reply. So the server, thinking the client knows that the buffers are invalid, is waiting for another GetBuffers request before sending any more invalidate events. The client, on the other hand, believes the buffers to be valid, and thus is expecting to receive another invalidate event before it has to send another GetBuffers request. The end result is that the client never again sends a GetBuffers request. To avoid this problem, take a snapshot of the lastStamp before doing GetBuffers, and retry if the snapshot and the current lastStamp no longer match after the GetBuffers reply has been processed. Signed-off-by: Ville Syrjälä <syrjala@sci.fi> Signed-off-by: Dave Airlie <airlied@redhat.com>
ommon/dri_drawable.c
|
c5976017e31828dd67fb54e8c11b863fffcac70b |
24-Jan-2012 |
Lauri Kasanen <cand@gmx.com> |
gallium/postprocess: Fix depth logic This prevents a possible lapse of the depth buffer - the situation where the app and pp have different depth buffers. NOTE: This is a candidate for the 8.0 stable branch. Signed-off-by: Lauri Kasanen <cand@gmx.com>
ommon/dri_context.c
|
c72d7df16879e3210946ba92a7edc823815b6f16 |
29-Jan-2012 |
Benjamin Franzke <benjaminfranzke@googlemail.com> |
st/dri: Support 24bit formats in dri2_allocate_buffer Prior commit 576161289df68eedade591fbca4013329c9e5ded, the parameter format was bpp, thus both 24bit and 32bit formats were requested with format set to 32. Handle 24bit seperately now. Fixes RGBX formats in wayland platform for egl_dri2 (EGL_ALPHA_SIZE=0). Note: This is a candidate for the 8.0 branch.
rm/dri2.c
|
81da773f841aa69debc473537750c475e6261e37 |
18-Jan-2012 |
Stéphane Marchesin <marcheu@chromium.org> |
st/dri: Remove useless flush front. In the following scenario: - CreateContext C1 - MakeCurrent C1 - DestroyContext C1 (does not actually destroy the first context, postponed until the next MakeCurrent) - CreateContext C2 - MakeCurrent C2 MakeCurrent will call flush on a half destroyed context, leading to crashes. Since the other paths (destroy and makecurrent) already flush the context, there is no need to flush here, so we remove this useless flush front call. This fixes GPU crashes with Chrome and gallium drivers.
ommon/dri_context.c
|
221c678329fd1c073d5f8dcf387129cd426ecf07 |
18-Jan-2012 |
Kristian Høgsberg <krh@bitplanet.net> |
gbm: Validate usage flags in gbm_bo_create_from_egl_image() The entry point is supposed to validate that the EGLImage is suitable for the passed in usage flags, but that was never implemented.
rm/dri2.c
|
e532b6288f01b63d8d8ba8c8dc08292967e65490 |
01-Dec-2011 |
Ian Romanick <ian.d.romanick@intel.com> |
dri2: Add plumbing to get context version requirements and flags to drivers This adds support for DRI_DRI2 version 3 to all of the DRI2 drivers. Signed-off-by: Ian Romanick <ian.d.romanick@intel.com>
ommon/dri_context.c
ommon/dri_context.h
|
d18152028e1825c05c7de33acacee3336350a096 |
14-Dec-2011 |
Ian Romanick <ian.d.romanick@intel.com> |
st-api: Have context_create explain why creation failed This won't be used in the client-side libGL, but the xserver has to generate a different protocol error depending on the reason context creation failed. Signed-off-by: Ian Romanick <ian.d.romanick@intel.com> Reviewed-by: Brian Paul <brianp@vmware.com> Reviewed-by: Chia-I Wu <olv@lunarg.com>
ommon/dri_context.c
|
576161289df68eedade591fbca4013329c9e5ded |
06-Dec-2011 |
Thomas Hellstrom <thellstrom@vmware.com> |
st/dri: Use depth instead of bpp when communicating formats with the X server v3 Some hardware can't reinterpret the format of hardware buffers and thus the X server needs to know the format when the buffer is created. Signed-off-by: Thomas Hellstrom <thellstrom@vmware.com> Reviewed-by: Michel Daenzer <michel@daenzer.net> Reviewed-by: Jakob Bornecrantz <jakob@vmware.com>
rm/dri2.c
|
f4515d106cd40351133c89855e3277a70bba8721 |
06-Nov-2011 |
Vinson Lee <vlee@vmware.com> |
st/dri: Fix memory leak on error path. Fixes Coverity resource leak defect. Reviewed-by: José Fonseca <jfonseca@vmware.com>
rm/dri2.c
|
78c076e6548f0bb44758d89ec434bcfddd902939 |
03-Nov-2011 |
George Sapountzis <gsapountzis@gmail.com> |
dri: drop drisw_util.h
ommon/dri_context.h
ommon/dri_screen.h
ommon/dri_wrapper.h
rm/dri2_buffer.h
|
875a757ddd103722cfe9a2b21035024aa5a23d32 |
03-Nov-2011 |
George Sapountzis <gsapountzis@gmail.com> |
dri: unify __DRIscreenRec Also drop DriverAPI field, this is a static symbol and I don't see why it should be accessed through __DRIscreenRec
ommon/dri_drawable.c
ommon/dri_screen.c
ommon/dri_screen.h
rm/dri2.c
w/drisw.c
|
7192c37294964b3f6e1551469f161593ec8f851d |
02-Nov-2011 |
George Sapountzis <gsapountzis@gmail.com> |
dri: unify __DriverAPIRec I dropped the comments because they don't add much.
rm/dri2.c
w/drisw.c
|
fc9e80fab9dc529cbe67cc718b89b17e18fa41d8 |
03-Nov-2011 |
George Sapountzis <gsapountzis@gmail.com> |
dri: drop drmLock remnants
ommon/dri_context.c
ommon/dri_context.h
ommon/dri_screen.h
|
a0d8e5d12a059fcb5e606c262d30e41ad6248282 |
02-Nov-2011 |
José Fonseca <jfonseca@vmware.com> |
gallium/dri: Remove references to vblank.
rm/Makefile
|
d14a1071582c9a802f0b37556665b79f38f7eaae |
02-Nov-2011 |
Kristian Høgsberg <krh@bitplanet.net> |
Fix gallium dri compile and a merge conflict
ommon/dri_drawable.c
rm/dri2.c
|
2e53f3018f69d07b885c5885a1f865339700a189 |
28-Oct-2011 |
Kristian Høgsberg <krh@bitplanet.net> |
dri: Remove unused dri texmem.c
rm/Makefile
|
a14bb89d3ffda49ec8e64453640b42b670cb43a7 |
28-Oct-2011 |
Kristian Høgsberg <krh@bitplanet.net> |
dri: Drop unused dri renderbuffer helper functions
rm/Makefile
|
e9beaf65fdaf82a7845cbe176f353ddb6b8466c7 |
28-Oct-2011 |
Kristian Høgsberg <krh@bitplanet.net> |
dri: Remove unnecessary timestamp pointer indirection
ommon/dri_drawable.c
rm/dri2.c
|
d24b81e0e0f4109f3256dc45b0adc5ffd59fb749 |
28-Oct-2011 |
Kristian Høgsberg <krh@bitplanet.net> |
dri: Remove cliprect information from __DRIdrawable
rm/dri2.c
|
73ec71cb16fbae0effcb4a92da7dc7f17cd6a62a |
28-Oct-2011 |
Kristian Høgsberg <krh@bitplanet.net> |
dri: Remove driMediaStreamCounterExtension Also DRI1-only.
rm/dri2.c
|
759cbb751b29b1c6608593841c56e0ad08eb33b0 |
28-Oct-2011 |
Kristian Høgsberg <krh@bitplanet.net> |
dri: Remove driSwapControlExtension DRI1-only as well.
rm/dri2.c
|
8e898e83c6934fc9c62730ad82fbf6f9d9180577 |
28-Oct-2011 |
Kristian Høgsberg <krh@bitplanet.net> |
dri: Drop driCopySubBufferExtension Another DRI1-only extension.
rm/dri2.c
|
ad3221587164c10ae16d85db514484b717cabc6f |
28-Oct-2011 |
Kristian Høgsberg <krh@bitplanet.net> |
dri: Drop driReadDrawableExtension All DRI2 drivers support setting a separate read drawable.
rm/dri2.c
|
32039126007a67a6bcca5973a7406c41ccc8c543 |
28-Oct-2011 |
Kristian Høgsberg <krh@bitplanet.net> |
dri: Drop driLegacyExtension There are no DRI1 drivers left.
rm/dri2.c
|
0c425ac18c56ea3315fcb0fdeecfa3685a52f4ba |
02-Nov-2011 |
George Sapountzis <gsapountzis@gmail.com> |
st/dri/sw: add get_image inline helper similar to put_image TODO: check if GetImage works with passing the pitch as width, similar to PutImage, which avoids the extra copy, ala dri_sw_displaytarget_display() in src/gallium/winsys/sw/dri/dri_sw_winsys.c
w/drisw.c
|
31156c07b0292e477fa0d1f11fe7a318b6eda254 |
02-Nov-2011 |
Benjamin Franzke <benjaminfranzke@googlemail.com> |
st/dri/sw: Fix incorrect cast Missed one casting error due to rebase for commit 98aa2a8f725e44aec8bd998fe436a134e94f13bb.
w/drisw.c
|
98aa2a8f725e44aec8bd998fe436a134e94f13bb |
09-Sep-2011 |
Benjamin Franzke <benjaminfranzke@googlemail.com> |
st/dri/sw: Implement texture_from_pixmap This is a cleanup of commit 02f1b50987c0d24da3dcc36dbb44821c20d0660c. Update tex buffer using a dri_drawable hook from implemented in sw/drisw.c. This saves us the duplication of dri_drawable.c. CC: Stuart Abercrombie <sabercrombie@chromium.org> CC: Stéphane Marchesin <marcheu@chromium.org>
ommon/dri_drawable.c
ommon/dri_drawable.h
rm/dri2.c
w/drisw.c
|
0a2afcb754c9d291f13650732a6a40aac1a019f2 |
09-Sep-2011 |
Benjamin Franzke <benjaminfranzke@googlemail.com> |
Revert "Duplicate state_tracker/dri/sw/dri_drawable.c" This reverts commit 569bde1fa7d03fb7688d0d391b32e61e857ad44e. CC: Stuart Abercrombie <sabercrombie@chromium.org> CC: Stéphane Marchesin <marcheu@chromium.org>
ommon/dri_drawable.c
|
5da7c5e36478a2afa2a54a6746c01d0893c41db4 |
09-Sep-2011 |
Benjamin Franzke <benjaminfranzke@googlemail.com> |
Revert "state_trackers/dri/sw: Implement texture_from_pixmap." This reverts commit 02f1b50987c0d24da3dcc36dbb44821c20d0660c. CC: Stuart Abercrombie <sabercrombie@chromium.org> CC: Stéphane Marchesin <marcheu@chromium.org>
ommon/dri_drawable.c
|
bde2fc5a7123829dc87d3761934627555be4446f |
12-Oct-2011 |
Thomas Hellstrom <thellstrom@vmware.com> |
st/dri: Hook up throttling based on the drm driver_descriptor configuration Hooks up throttling if there is a configuration function present and it indicates that throttling is desired. Signed-off-by: Thomas Hellstrom <thellstrom@vmware.com> Reviewed-by: Jakob Bornecrantz <jakob@vmware.com>
ommon/dri_drawable.c
ommon/dri_screen.h
rm/dri2.c
|
23c41233ce9ac13ba60242f9e839d5b13d1ea803 |
11-Oct-2011 |
Thomas Hellstrom <thellstrom@vmware.com> |
st/dri: Implement the new dri2 throttling extension But don't hook it up just yet until we figure out a good way to do that. Also, we should, in the future, add driconf options to control what throttling reasons should be honored, and the number of outstanding swaps allowed. Signed-off-by: Thomas Hellstrom <thellstrom@vmware.com> Reviewed-by: Jakob Bornecrantz <jakob@vmware.com>
ommon/dri_drawable.c
ommon/dri_drawable.h
|
866f9b18c68ede63c00917ec9c3dae3524ca8826 |
11-Sep-2011 |
Dave Airlie <airlied@redhat.com> |
gallium: rename ZS stencil type to UINT (v2) these are never USCALED, always UINT in reality. taken from some work by Christoph Bumiller v2: fixup formatting of table + tabs Signed-off-by: Dave Airlie <airlied@redhat.com>
ommon/dri_screen.c
|
3db309aecee57d7e0055a49a0e12a491a554347b |
01-Oct-2011 |
Stéphane Marchesin <marcheu@chromium.org> |
configure: replace pkg-config calls with $(PKG_CONFIG) in the makefiles. Us poor souls who cross compile mesa want to be able to specify which pkg-config to pick, or at least just change one place. Reviewed-by: Brian Paul <brianp@vmware.com> Reviewed-by: Matt Turner <mattst88@gmail.com>
rm/Makefile
|
7e302168798907e6e0b08d96141d97f04958a73e |
10-Sep-2011 |
Marek Olšák <maraeo@gmail.com> |
st/dri: remove the call to driInitExtensions The function no longer exists. This fixes Gallium build.
ommon/dri_context.c
|
4f341ee65a7f9017481108861adaf1ed2ca227c5 |
21-Aug-2011 |
Chia-I Wu <olv@lunarg.com> |
st/dri: add support for __DRI_IMAGE_FORMAT_ABGR8888 It maps to PIPE_FORMAT_R8G8B8A8_UNORM.
rm/dri2.c
|
02f1b50987c0d24da3dcc36dbb44821c20d0660c |
30-Aug-2011 |
Stéphane Marchesin <marcheu@chromium.org> |
state_trackers/dri/sw: Implement texture_from_pixmap. Signed-off-by: Stuart Abercrombie <sabercrombie@chromium.org> Signed-off-by: Stéphane Marchesin <marcheu@chromium.org>
ommon/dri_drawable.c
|
569bde1fa7d03fb7688d0d391b32e61e857ad44e |
30-Aug-2011 |
Stéphane Marchesin <marcheu@chromium.org> |
Duplicate state_tracker/dri/sw/dri_drawable.c We need this for the upcoming fix for sw texture_from_pixmap. Signed-off-by: Stuart Abercrombie <sabercrombie@chromium.org> Signed-off-by: Stéphane Marchesin <marcheu@chromium.org>
ommon/dri_drawable.c
|
421235d42ad9921fd45332ec7b33bcee5c1ad33d |
19-Aug-2011 |
Lauri Kasanen <cand@gmx.com> |
st/dri: Bind the post-processing queue to dri Signed-off-by: Lauri Kasanen <cand@gmx.com> Signed-off-by: Brian Paul <brianp@vmware.com>
ommon/dri_context.c
ommon/dri_context.h
ommon/dri_screen.c
rm/dri2.c
w/drisw.c
|
65bdb878a0afcdffe51716ae4533a04990c7d556 |
30-Jun-2011 |
Lauri Kasanen <cand@gmx.com> |
st/dri: Indent driconf options
ommon/dri_screen.c
|
5e7713caa9d601e59b600218a3b867db0f331deb |
16-Aug-2011 |
Marek Olšák <maraeo@gmail.com> |
st/dri: remove an unused-but-set variable
rm/dri2.c
|
f272117def7a7962f355581d038af6d0981a23cb |
16-Aug-2011 |
Cooper Yuan <cooperyuan@gmail.com> |
dri2: check if context is valid before flushing the pipe
rm/dri2.c
|
9b784069ce76e1914eaafac0542458f6a84d9fc0 |
16-Aug-2011 |
Cooper Yuan <cooperyuan@gmail.com> |
dri2: add code to dri2_Flush extension. It's going to flush client's commands in eglWaitClient(). Before this, egl applications using pixmap or pbuffer flicker because of no flush. Reviewed-by: Alan Hourihane
rm/dri2.c
|
115651241b7f04e7ec274c267e7de5d1c8fb8c9f |
05-Aug-2011 |
Marek Olšák <maraeo@gmail.com> |
st/dri: remove an unused-but-set variable
rm/dri2.c
|
a3cde50effbc469379bf5d4d69d03464de43fb29 |
05-Aug-2011 |
Marek Olšák <maraeo@gmail.com> |
st/dri: remove a dummy function dri2_create_context It does nothing besides calling dri_create_context with the same parameters.
rm/dri2.c
|
d644a50dc328e54d513e4304378bb8c34148f7cc |
10-Jul-2011 |
Marek Olšák <maraeo@gmail.com> |
st/dri: remove unused variables
ommon/dri_context.c
|
235225ec935002b4669d14a48c9c20864a5496f8 |
30-Jun-2011 |
José Fonseca <jfonseca@vmware.com> |
scons: Expose pkg-config in a simpler manner.
rm/SConscript
|
ade9f0d727092ca86f3896f733e085d9fd2bb8b2 |
28-Jun-2011 |
Thomas Hellstrom <thellstrom@vmware.com> |
st/dri: Get rid of the evil struct dri_drawable::context member It's incorrect to assume a single context bound to a drawable. Signed-off-by: Thomas Hellstrom <thellstrom@vmware.com>
ommon/dri_context.c
ommon/dri_drawable.h
|
ac8fdbc1c723afb19eeaba5457ba78d0bf33b8d4 |
29-Jun-2011 |
Thomas Hellstrom <thellstrom@vmware.com> |
st-api: Rework how drawables are invalidated v3. The api and the state tracker manager code as well as the state tracker code assumed that only a single context could be bound to a drawable. That is not a valid assumption, since multiple contexts can bind to the same drawable. Fix this by making it the state tracker's responsibility to update all contexts binding to a drawable Note that the state trackers themselves don't use atomic stamps on frame-buffers. Multiple context rendering to the same drawable should be protected by the application. Signed-off-by: Thomas Hellstrom <thellstrom@vmware.com>
ommon/dri_drawable.c
rm/dri2.c
w/drisw.c
|
15d7f1c1c73735eb108710a01806712b11ce5e8a |
09-Mar-2011 |
Benjamin Franzke <benjaminfranzke@googlemail.com> |
st/dri: Implement DRIimageExtension::dupImage
rm/dri2.c
|
ea90eca44b790119f0d1fbe45cac120a374cb0ca |
13-May-2011 |
Benjamin Franzke <benjaminfranzke@googlemail.com> |
st/dri: Support dri2 useflags in dri2_create_image
rm/dri2.c
|
1868d21c8ee1fdf775f3e3ddbb1c48fa89d5850c |
12-Mar-2011 |
Marek Olšák <maraeo@gmail.com> |
st/dri: fix warning: ‘bind’ may be used uninitialized in this function
rm/dri2.c
|
7e02303497237cde958c28608477d0c355a8038b |
08-Mar-2011 |
Marek Olšák <maraeo@gmail.com> |
gallium: remove flags from the flush function The drivers have been changed so that they behave as if all of the flags were set. This is already implicit in most hardware drivers and required for multiple contexts. Some state trackers were also abusing the PIPE_FLUSH_RENDER_CACHE flag to decide whether flush_frontbuffer should be called. New flag ST_FLUSH_FRONT has been added to st_api.h as a replacement.
ommon/dri_context.c
w/drisw.c
|
e968975cb57eb854769292f7c6ff773c64a386c3 |
08-Mar-2011 |
Marek Olšák <maraeo@gmail.com> |
gallium: remove the geom_flags param from is_format_supported
ommon/dri_screen.c
|
2b64886c8122227ffa2d86abb9b4a5d79d1e2451 |
11-Mar-2011 |
Adam Jackson <ajax@redhat.com> |
swrastg: Add __DRI_TEX_BUFFER support Without this, EXT_texture_from_pixmap is trivially broken. With it, it's merely subtly broken. Signed-off-by: Adam Jackson <ajax@redhat.com>
w/drisw.c
|
b1ceda5cbdfe716824cb1f1689a7fc48611f297f |
01-Mar-2011 |
Dave Airlie <airlied@redhat.com> |
st/dri: one more missing array size whats one more between friends. again bnf on irc.
rm/dri2.c
|
02448f2241d90fdbf97b0197e857a8f5acf5d4c7 |
01-Mar-2011 |
Dave Airlie <airlied@redhat.com> |
st/dri: fix missing array size init. Init array size to 1, reported by bnf on irc.
rm/dri2.c
|
94ccc31ba4f64ac480137fd90f1ded44d2072f6e |
01-Dec-2010 |
Jakob Bornecrantz <wallbraker@gmail.com> |
st/dri: Track drawable context bindings Needs to track this ourself since because we get into a race condition with the dri_util.c code on make current when rendering to the front buffer. This is what happens: Old context is rendering to the front buffer. App calls MakeCurrent with a new context. dri_util.c sets drawable->driContextPriv to the new context and then calls the driver make current. st/dri make current flushes the old context, which calls back into st/dri via the flush frontbuffer hook. st/dri calls dri loader flush frontbuffer, which calls invalidate buffer on the drawable into st/dri. This is where things gets wrong. st/dri grabs the context from the dri drawable (which now points to the new context) and calls invalidate framebuffer to the new context which has not yet set the new drawable as its framebuffers since we have not called make current yet, it asserts.
ommon/dri_context.c
ommon/dri_drawable.c
ommon/dri_drawable.h
rm/dri2.c
|
71fa2270293f7e3aa8e42b397bebb24d3fcd9b1f |
09-Feb-2011 |
Benjamin Franzke <benjaminfranzke@googlemail.com> |
st/dri: Set render_buffer in dri_fill_st_visual st/mesa/st_managaer.c needs render_buffer in order to determinde which buffer should be rendered to.
ommon/dri_screen.c
|
fa3283cca8a2b010db60d9879b0f87802c0c9a3f |
09-Feb-2011 |
Benjamin Franzke <benjaminfranzke@googlemail.com> |
st/dri: img_from_renderbuf: Fix incorrect usage of dri_context()
rm/dri2.c
|
0acb31be171f01aec8b38ceaddf47b7da6dae2a0 |
09-Feb-2011 |
Benjamin Franzke <benjaminfranzke@googlemail.com> |
st/dri: Fix surfaceless gl using contexts with previous bound surfaces ctx->dPriv might be != NULL then draw which is NULL is accessed: struct dri_drawable *draw = dri_drawable(driDrawPriv); [..] if (ctx->dPriv != driDrawPriv) { ctx->dPriv = driDrawPriv; draw->texture_stamp = driDrawPriv->lastStamp - 1; }
ommon/dri_context.c
|
f8e939a3a737971ac9d59494a0c433c22b25e628 |
04-Feb-2011 |
Benjamin Franzke <benjaminfranzke@googlemail.com> |
st/dri: Implement dri2::{Allocate,Release}Buffer
rm/dri2.c
rm/dri2_buffer.h
|
484edfc8151ddf63d3e0e7be3b4c8fa3906a0ec9 |
21-Jan-2011 |
Jakob Bornecrantz <wallbraker@gmail.com> |
st/dri: Fix warning
ommon/dri_drawable.c
|
4c7001462607e6e99e474d6271dd481d3f8f201c |
02-Dec-2010 |
Roland Scheidegger <sroland@vmware.com> |
gallium: support for array textures and related changes resources have a array_size parameter now. get_tex_surface and tex_surface_destroy have been renamed to create_surface and surface_destroy and moved to context, similar to sampler views (and create_surface now uses a template just like create_sampler_view). Surfaces now really should only be used for rendering. In particular they shouldn't be used as some kind of 2d abstraction for sharing a texture. offset/layout fields don't make sense any longer and have been removed, width/height should go too. surfaces and sampler views now specify a layer range (for texture resources), layer is either array slice, depth slice or cube face. pipe_subresource is gone array slices (or cube faces) are now treated the same as depth slices in transfers etc. (that is, they use the z coord of the respective functions). Squashed commit of the following: commit a45bd509014743d21a532194d7b658a1aeb00cb7 Merge: 1aeca28 32e1e59 Author: Roland Scheidegger <sroland@vmware.com> Date: Thu Dec 2 04:32:06 2010 +0100 Merge remote branch 'origin/master' into gallium-array-textures Conflicts: src/gallium/drivers/i915/i915_resource_texture.c src/gallium/drivers/i915/i915_state_emit.c src/gallium/drivers/i915/i915_surface.c commit 1aeca287a827f29206078fa1204715a477072c08 Merge: 912f042 6f7c8c3 Author: Roland Scheidegger <sroland@vmware.com> Date: Thu Dec 2 00:37:11 2010 +0100 Merge remote branch 'origin/master' into gallium-array-textures Conflicts: src/gallium/state_trackers/vega/api_filters.c src/gallium/state_trackers/vega/api_images.c src/gallium/state_trackers/vega/mask.c src/gallium/state_trackers/vega/paint.c src/gallium/state_trackers/vega/renderer.c src/gallium/state_trackers/vega/st_inlines.h src/gallium/state_trackers/vega/vg_context.c src/gallium/state_trackers/vega/vg_manager.c commit 912f042e1d439de17b36be9a740358c876fcd144 Author: Roland Scheidegger <sroland@vmware.com> Date: Wed Dec 1 03:01:55 2010 +0100 gallium: even more compile fixes after merge commit 6fc95a58866d2a291def333608ba9c10c3f07e82 Author: Roland Scheidegger <sroland@vmware.com> Date: Wed Dec 1 00:22:26 2010 +0100 gallium: some fixes after merge commit a8d5ffaeb5397ffaa12fb422e4e7efdf0494c3e2 Merge: f7a202f 2da02e7 Author: Roland Scheidegger <sroland@vmware.com> Date: Tue Nov 30 23:41:26 2010 +0100 Merge remote branch 'origin/master' into gallium-array-textures Conflicts: src/gallium/drivers/i915/i915_state_emit.c src/gallium/state_trackers/vega/api_images.c src/gallium/state_trackers/vega/vg_context.c commit f7a202fde2aea2ec78ef58830f945a5e214e56ab Author: Roland Scheidegger <sroland@vmware.com> Date: Wed Nov 24 19:19:32 2010 +0100 gallium: even more fixes/cleanups after merge commit 6895a7f969ed7f9fa8ceb788810df8dbcf04c4c9 Author: Roland Scheidegger <sroland@vmware.com> Date: Wed Nov 24 03:07:36 2010 +0100 gallium: more compile fixes after merge commit af0501a5103b9756bc4d79167bd81051ad6e8670 Author: Roland Scheidegger <sroland@vmware.com> Date: Tue Nov 23 19:24:45 2010 +0100 gallium: lots of compile fixes after merge commit 0332003c2feb60f2a20e9a40368180c4ecd33e6b Merge: 26c6346 b6b91fa Author: Roland Scheidegger <sroland@vmware.com> Date: Tue Nov 23 17:02:26 2010 +0100 Merge remote branch 'origin/master' into gallium-array-textures Conflicts: src/gallium/auxiliary/gallivm/lp_bld_sample.c src/gallium/auxiliary/util/u_blit.c src/gallium/auxiliary/util/u_blitter.c src/gallium/auxiliary/util/u_inlines.h src/gallium/auxiliary/util/u_surface.c src/gallium/auxiliary/util/u_surfaces.c src/gallium/docs/source/context.rst src/gallium/drivers/llvmpipe/lp_rast.c src/gallium/drivers/nv50/nv50_state_validate.c src/gallium/drivers/nvfx/nv04_surface_2d.c src/gallium/drivers/nvfx/nv04_surface_2d.h src/gallium/drivers/nvfx/nvfx_buffer.c src/gallium/drivers/nvfx/nvfx_miptree.c src/gallium/drivers/nvfx/nvfx_resource.c src/gallium/drivers/nvfx/nvfx_resource.h src/gallium/drivers/nvfx/nvfx_state_fb.c src/gallium/drivers/nvfx/nvfx_surface.c src/gallium/drivers/nvfx/nvfx_transfer.c src/gallium/drivers/r300/r300_state_derived.c src/gallium/drivers/r300/r300_texture.c src/gallium/drivers/r600/r600_blit.c src/gallium/drivers/r600/r600_buffer.c src/gallium/drivers/r600/r600_context.h src/gallium/drivers/r600/r600_screen.c src/gallium/drivers/r600/r600_screen.h src/gallium/drivers/r600/r600_state.c src/gallium/drivers/r600/r600_texture.c src/gallium/include/pipe/p_defines.h src/gallium/state_trackers/egl/common/egl_g3d_api.c src/gallium/state_trackers/glx/xlib/xm_st.c src/gallium/targets/libgl-gdi/gdi_softpipe_winsys.c src/gallium/targets/libgl-gdi/libgl_gdi.c src/gallium/tests/graw/tri.c src/mesa/state_tracker/st_cb_blit.c src/mesa/state_tracker/st_cb_readpixels.c commit 26c6346b385929fba94775f33838d0cceaaf1127 Author: Roland Scheidegger <sroland@vmware.com> Date: Mon Aug 2 19:37:21 2010 +0200 fix more merge breakage commit b30d87c6025eefe7f6979ffa8e369bbe755d5c1d Merge: 9461bf3 1f1928d Author: Roland Scheidegger <sroland@vmware.com> Date: Mon Aug 2 19:15:38 2010 +0200 Merge remote branch 'origin/master' into gallium-array-textures Conflicts: src/gallium/drivers/llvmpipe/lp_rast.c src/gallium/drivers/llvmpipe/lp_rast_priv.h src/gallium/drivers/r300/r300_blit.c src/gallium/drivers/r300/r300_screen_buffer.c src/gallium/drivers/r300/r300_state_derived.c src/gallium/drivers/r300/r300_texture.c src/gallium/drivers/r300/r300_texture.h src/gallium/drivers/r300/r300_transfer.c src/gallium/drivers/r600/r600_screen.c src/gallium/drivers/r600/r600_state.c src/gallium/drivers/r600/r600_texture.c src/gallium/drivers/r600/r600_texture.h src/gallium/state_trackers/dri/common/dri1_helper.c src/gallium/state_trackers/dri/sw/drisw.c src/gallium/state_trackers/xorg/xorg_exa.c commit 9461bf3cfb647d2301364ae29fc3084fff52862a Merge: 17492d7 0eaccb3 Author: Roland Scheidegger <sroland@vmware.com> Date: Thu Jul 15 20:13:45 2010 +0200 Merge commit 'origin/master' into gallium-array-textures Conflicts: src/gallium/auxiliary/util/u_blitter.c src/gallium/drivers/llvmpipe/lp_rast.c src/gallium/drivers/llvmpipe/lp_surface.c src/gallium/drivers/r300/r300_render.c src/gallium/drivers/r300/r300_state.c src/gallium/drivers/r300/r300_texture.c src/gallium/drivers/r300/r300_transfer.c src/gallium/tests/trivial/quad-tex.c commit 17492d705e7b7f607b71db045c3bf344cb6842b3 Author: Roland Scheidegger <sroland@vmware.com> Date: Fri Jun 18 10:58:08 2010 +0100 gallium: rename element_offset/width fields in views to first/last_element This is much more consistent with the other fields used there (first/last level, first/last layer). Actually thinking about removing the ugly union/structs again and rename first/last_layer to something even more generic which could also be used for buffers (like first/last_member) without inducing headaches. commit 1b717a289299f942de834dcccafbab91361e20ab Author: Roland Scheidegger <sroland@vmware.com> Date: Thu Jun 17 14:46:09 2010 +0100 gallium: remove PIPE_SURFACE_LAYOUT_LINEAR definition This was only used by the layout field of pipe_surface, but this driver internal stuff is gone so there's no need for this driver independent layout definition neither. commit 10cb644b31b3ef47e6c7b55e514ad24bb891fac4 Merge: 5691db9 c85971d Author: Roland Scheidegger <sroland@vmware.com> Date: Thu Jun 17 12:20:41 2010 +0100 Merge commit 'origin/master' into gallium-array-textures Conflicts: src/gallium/docs/source/glossary.rst src/gallium/tests/graw/fs-test.c src/gallium/tests/graw/gs-test.c commit 5691db960ca3d525ce7d6c32d9c7a28f5e907f3b Author: Roland Scheidegger <sroland@vmware.com> Date: Thu Jun 17 11:29:03 2010 +0100 st/wgl: fix interface changes bugs commit 2303ec32143d363b46e59e4b7c91b0ebd34a16b2 Author: Roland Scheidegger <sroland@vmware.com> Date: Wed Jun 16 19:42:32 2010 +0100 gallium: adapt code to interface changes... commit dcae4f586f0d0885b72674a355e5d56d47afe77d Author: Roland Scheidegger <sroland@vmware.com> Date: Wed Jun 16 19:42:05 2010 +0100 gallium: separate depth0 and array_size in the resource itself. These fields are still mutually exclusive (since no 3d array textures exist) but it ultimately seemed to error-prone to adapt all code accept the new meaning of depth0 (drivers stick that into hardware regs, calculate mipmap sizes etc.). And it isn't really cleaner anyway. So, array textures will have depth0 of 1, but instead use array_size, 3D textures will continue to use depth0 (and have array_size of 1). Cube maps also will use array_size to indicate their 6 faces, but since all drivers should just be fine by inferring this themselves from the fact it's a cube map as they always used to nothing should break. commit 621737a638d187d208712250fc19a91978fdea6b Author: Roland Scheidegger <sroland@vmware.com> Date: Wed Jun 16 17:47:38 2010 +0100 gallium: adapt code to interface changes There are still usages of pipe_surface where pipe_resource should be used, which should eventually be fixed. commit 2d17f5efe166b2c3d51957c76294165ab30b8ae2 Author: Roland Scheidegger <sroland@vmware.com> Date: Wed Jun 16 17:46:14 2010 +0100 gallium: more interface changes In particular to enable usage of buffers in views, and ability to use a different pipe_format in pipe_surface. Get rid of layout and offset parameter in pipe_surface - the former was not used in any (public) code anyway, and the latter should either be computed on-demand or driver can use subclass of pipe_surface. Also make create_surface() use a template to be more consistent with other functions. commit 71f885ee16aa5cf2742c44bfaf0dc5b8734b9901 Merge: 3232d11 8ad410d Author: Roland Scheidegger <sroland@vmware.com> Date: Mon Jun 14 14:19:51 2010 +0100 Merge commit 'origin/master' into gallium-array-textures Conflicts: src/gallium/auxiliary/util/u_box.h src/gallium/drivers/nv50/nv50_surface.c src/gallium/drivers/nvfx/nvfx_surface.c src/gallium/drivers/r300/r300_blit.c src/gallium/drivers/r300/r300_texture.c src/gallium/drivers/r300/r300_transfer.c src/gallium/drivers/r600/r600_blit.c src/gallium/drivers/r600/r600_screen.h src/gallium/include/pipe/p_state.h commit 3232d11fe3ebf7686286013c357b404714853984 Author: Roland Scheidegger <sroland@vmware.com> Date: Mon Jun 14 11:40:04 2010 +0100 mesa/st: adapt to interface changes still need to fix pipe_surface sharing (as that is now per-context). Also broken is depth0 handling - half the code assumes this is also used for array textures (and hence by extension of that cube maps would have depth 6), half the code does not... commit f433b7f7f552720e5eade0b4078db94590ee85e1 Author: Roland Scheidegger <sroland@vmware.com> Date: Mon Jun 14 11:35:52 2010 +0100 gallium: fix a couple of bugs in interface chnage fixes commit 818366b28ea18f514dc791646248ce6f08d9bbcf Author: Roland Scheidegger <sroland@vmware.com> Date: Sat Jun 12 02:42:11 2010 +0200 targets: adapt to interface changes Yes even that needs adjustments... commit 66c511ab1682c9918e0200902039247793acb41e Author: Roland Scheidegger <sroland@vmware.com> Date: Sat Jun 12 02:41:13 2010 +0200 tests: adapt to interface changes Everything needs to be fixed :-(. commit 6b494635d9dbdaa7605bc87b1ebf682b138c5808 Author: Roland Scheidegger <sroland@vmware.com> Date: Sat Jun 12 02:39:50 2010 +0200 st: adapt non-rendering state trackers to interface changes might not be quite right in all places, but they really don't want to use pipe_surface. commit 00c4289a35d86e4fe85919ec32aa9f5ffe69d16d Author: Roland Scheidegger <sroland@vmware.com> Date: Sat Jun 12 02:38:48 2010 +0200 winsys: adapt to interface changes commit 39d858554dc9ed5dbc795626fec3ef9deae552a0 Author: Roland Scheidegger <sroland@vmware.com> Date: Sat Jun 12 02:26:54 2010 +0200 st/python: adapt to interface changes don't think that will work, sorry. commit 6e9336bc49b32139cec4e683857d0958000e15e3 Author: Roland Scheidegger <sroland@vmware.com> Date: Sat Jun 12 02:26:07 2010 +0200 st/vega: adapt to interface changes commit e07f2ae9aaf8842757d5d50865f76f8276245e11 Author: Roland Scheidegger <sroland@vmware.com> Date: Sat Jun 12 02:25:56 2010 +0200 st/xorg: adapt to interface changes commit 05531c10a74a4358103e30d3b38a5eceb25c947f Author: Roland Scheidegger <sroland@vmware.com> Date: Sat Jun 12 02:24:53 2010 +0200 nv50: adapt to interface changes commit 97704f388d7042121c6d496ba8c003afa3ea2bf3 Author: Roland Scheidegger <sroland@vmware.com> Date: Sat Jun 12 02:24:45 2010 +0200 nvfx: adapt to interface changes commit a8a9c93d703af6e8f5c12e1cea9ec665add1abe0 Author: Roland Scheidegger <sroland@vmware.com> Date: Sat Jun 12 02:24:01 2010 +0200 i965g: adapt to interface changes commit 0dde209589872d20cc34ed0b237e3ed7ae0e2de3 Author: Roland Scheidegger <sroland@vmware.com> Date: Sat Jun 12 02:22:38 2010 +0200 i915g: adapt to interface changes commit 5cac9beede69d12f5807ee1a247a4c864652799e Author: Roland Scheidegger <sroland@vmware.com> Date: Sat Jun 12 02:20:58 2010 +0200 svga: adapt to interface changes resource_copy_region still looking fishy. Was not very suited to unified zslice/face approach... commit 08b5a6af4b963a3e4c75fc336bf6c0772dce5150 Author: Roland Scheidegger <sroland@vmware.com> Date: Sat Jun 12 02:20:01 2010 +0200 rbug: adapt to interface changes Not sure if that won't need changes elsewhere? commit c9fd24b1f586bcef2e0a6e76b68e40fca3408964 Author: Roland Scheidegger <sroland@vmware.com> Date: Sat Jun 12 02:19:31 2010 +0200 trace: adapt to interface changes commit ed84e010afc5635a1a47390b32247a266f65b8d1 Author: Roland Scheidegger <sroland@vmware.com> Date: Sat Jun 12 02:19:21 2010 +0200 failover: adapt to interface changes commit a1d4b4a293da933276908e3393435ec4b43cf201 Author: Roland Scheidegger <sroland@vmware.com> Date: Sat Jun 12 02:19:12 2010 +0200 identity: adapt to interface changes commit a8dd73e2c56c7d95ffcf174408f38f4f35fd2f4c Author: Roland Scheidegger <sroland@vmware.com> Date: Sat Jun 12 02:18:55 2010 +0200 softpipe: adapt to interface changes commit a886085893e461e8473978e8206ec2312b7077ff Author: Roland Scheidegger <sroland@vmware.com> Date: Sat Jun 12 02:18:44 2010 +0200 llvmpipe: adapt to interface changes commit 70523f6d567d8b7cfda682157556370fd3c43460 Author: Roland Scheidegger <sroland@vmware.com> Date: Sat Jun 12 02:18:14 2010 +0200 r600g: adapt to interface changes commit 3f4bc72bd80994865eb9f6b8dfd11e2b97060d19 Author: Roland Scheidegger <sroland@vmware.com> Date: Sat Jun 12 02:18:05 2010 +0200 r300g: adapt to interface changes commit 5d353b55ee14db0ac0515b5a3cf9389430832c19 Author: Roland Scheidegger <sroland@vmware.com> Date: Sat Jun 12 02:17:37 2010 +0200 cell: adapt to interface changes not even compile tested commit cf5d03601322c2dcb12d7a9c2f1745e2b2a35eb4 Author: Roland Scheidegger <sroland@vmware.com> Date: Sat Jun 12 02:14:59 2010 +0200 util: adapt to interface changes amazing how much code changes just due to some subtle interface changes? commit dc98d713c6937c0e177fc2caf23020402cc7ea7b Author: Roland Scheidegger <sroland@vmware.com> Date: Sat Jun 12 02:12:40 2010 +0200 gallium: more interface fail, docs this also changes flush_frontbuffer to use a pipe_resource instead of a pipe_surface - pipe_surface is not meant to be (or at least no longer) an abstraction for standalone 2d images which get passed around. (This has also implications for the non-rendering state-trackers.) commit 08436d27ddd59857c22827c609b692aa0c407b7b Author: Roland Scheidegger <sroland@vmware.com> Date: Thu Jun 10 17:42:52 2010 +0200 gallium: fix array texture interface changes bugs, docs commit 4a4d927609b62b4d7fb9dffa35158afe282f277b Author: Roland Scheidegger <sroland@vmware.com> Date: Thu Jun 3 22:02:44 2010 +0200 gallium: interface changes for array textures and related cleanups This patch introduces array textures to gallium (note they are not immediately usable without the associated changes to the shader side). Also, this abandons pipe_subresource in favor of using level and layer parameters since the distinction between several faces (which was part of pipe_subresource for cube textures) and several z slices (which were not part of pipe_subresource but instead part of pipe_box where appropriate for 3d textures) is gone at the resource level. Textures, be it array, cube, or 3d, now use a "unified" set of parameters, there is no distinction between array members, cube faces, or 3d zslices. This is unlike d3d10, whose subresource index includes layer information for array textures, but which considers all z slices of a 3d texture to be part of the same subresource. In contrast to d3d10, OpenGL though reuses old 2d and 3d function entry points for 1d and 2d array textures, respectively, which also implies that for instance it is possible to specify all layers of a 2d array texture at once (note that this is not possible for cube maps, which use the 2d entry points, although it is possible for cube map arrays, which aren't supported yet in gallium). This should possibly make drivers a bit simpler, and also get rid of mutually exclusive parameters in some functions (as z and face were exclusive), one potential downside would be that 3d array textures could not easily be supported without reverting this, but those are nowhere to be seen. Also along with adjusting to new parameters, rename get_tex_surface / tex_surface_destroy to create_surface / surface_destroy and move them from screen to context, which reflects much better what those do (they are analogous to create_sampler_view / sampler_view_destroy). PIPE_CAP_ARRAY_TEXTURES is used to indicate if a driver supports all of this functionality (that is, both sampling from array texture as well as use a range of layers as a render target, with selecting the layer from the geometry shader).
ommon/dri_screen.c
ommon/dri_screen.h
rm/dri2.c
w/drisw.c
|
5b6ec5a553876266bfa2ef65081aa1075419b97e |
09-Nov-2010 |
Chia-I Wu <olv@lunarg.com> |
st/dri: Add support for surfaceless current contexts. Tested with Wayland.
ommon/dri_context.c
ommon/dri_drawable.h
ommon/dri_screen.c
|
f1600d3a9725803f0526fb3fd673787307539d27 |
05-Nov-2010 |
Jakob Bornecrantz <jakob@vmware.com> |
scons: Unify state tracker SConscripts
rm/SConscript
w/SConscript
|
7e9f5eab4e18e0b661fc9b65a0f409d10e041b24 |
05-Nov-2010 |
Jakob Bornecrantz <jakob@vmware.com> |
scons: Move dependancy checks to the main gallium scons file
rm/SConscript
w/SConscript
|
b4ac0adb75bddc1c17c57eb19c7e6dde52e4b7e7 |
04-Nov-2010 |
Jakob Bornecrantz <jakob@vmware.com> |
scons: Detabify Drivers scons files for a later time
Conscript
rm/SConscript
w/SConscript
|
d3491e775fb07f891463b2185d74bbad62f3ed24 |
12-Oct-2010 |
Kristian Høgsberg <krh@bitplanet.net> |
Rename GLvisual and __GLcontextModes to struct gl_config
ommon/dri_context.c
ommon/dri_context.h
ommon/dri_drawable.c
ommon/dri_drawable.h
ommon/dri_screen.c
ommon/dri_screen.h
rm/dri2.c
w/drisw.c
|
f8ee415e3c2fa8e475e9f7fad0315c06c232ff94 |
25-Sep-2010 |
Vinson Lee <vlee@vmware.com> |
st/dri: Remove unnecessary header.
ommon/dri_screen.c
|
17eace581d25a626a7d75d9d1205d012cbb14a6e |
23-Sep-2010 |
Kristian Høgsberg <krh@bitplanet.net> |
dri: Pass the __DRIscreen and the __DRIscreen private back to image lookup We will typically have a current context when we need to lookup the image, but the lookup implementation don't need it so drop it.
ommon/dri_context.h
ommon/dri_screen.c
ommon/dri_screen.h
rm/dri2.c
|
9ec0b2a45e18c045fd3dbcdf846fad7faf97494c |
22-Sep-2010 |
Kristian Høgsberg <krh@bitplanet.net> |
dri2: Make createImageFromName() take a __DRIscreen instead of __DRIcontext We can't expect to have a context when this is called, and we don't need one so just require a __DRIscreen instead. Reported by Yu Dai <yu.dai@intel.com>
rm/dri2.c
|
0cd480f07639ec9ee01424aaa3e0c900b2204d4f |
10-Sep-2010 |
Chia-I Wu <olv@lunarg.com> |
st/dri: Use profiles to create OpenGL ES contexts. Having 3 st_api's to provide OpenGL, OpenGL ES 1.1, and OpenGL ES 2.0 is not a sane abstraction, since all of them share glapi for current context/dispatch management.
ommon/dri_context.c
ommon/dri_screen.c
ommon/dri_screen.h
rm/dri2.c
|
4531356817ec8383ac35932903773de67af92e37 |
10-Sep-2010 |
Chia-I Wu <olv@lunarg.com> |
gallium: Add context profile support to st_api. Add struct st_context_attribs to describe context profiles and attributes. Modify st_api::create_context to take the new struct instead of an st_visual. st_context_attribs can be used to support GLX_ARB_create_context_profile and GLX_EXT_create_context_es2_profile in the future. But the motivation for doing it now is to be able to replace ST_API_OPENGL_ES1 and ST_API_OPENGL_ES2 by profiles. Having 3 st_api's to provide OpenGL, OpenGL ES 1.1, and OpenGL ES 2.0 is not a sane abstraction, since all of them share glapi for current context/dispatch management.
ommon/dri_context.c
|
1d61793824b77e45f2ecf9b7d38bfc36d2a5af52 |
26-Aug-2010 |
ben <benjaminfranzke@googlemail.com> |
st/dri: support EGL_MESA_image_drm: queryImage Signed-off-by: Jakob Bornecrantz <wallbraker@gmail.com>
rm/dri2.c
|
a572e3198d19b88a5418e12376e233a583b5977a |
26-Aug-2010 |
ben <benjaminfranzke@googlemail.com> |
st/dri: support EGL_MESA_image_drm: createImage Signed-off-by: Jakob Bornecrantz <wallbraker@gmail.com>
rm/dri2.c
|
7e03e2b2c787657f2abe4bd362e625bd9a971c48 |
08-Sep-2010 |
Chia-I Wu <olv@lunarg.com> |
st/dri: Call dri_init_extensions only for API_OPENGL. libmesagallium.a that this state tracker will be linked to expects OpenGL's _glapi_table. That is, it expects libGL.so instead of libGLESv1_CM.so or libGLESv2.so. As there is no clean way to know the shared library the app links to, use the api as a simple check. It might be as well to simply remove this function call though.
ommon/dri_context.c
|
444d8408e75bb2bce019769da59802f05c3d5fab |
08-Sep-2010 |
Chia-I Wu <olv@lunarg.com> |
st/dri: Use enum st_api_type internally.
ommon/dri_context.c
ommon/dri_context.h
ommon/dri_screen.c
ommon/dri_screen.h
rm/dri2.c
|
8e3b658b7fdc1c2a2b9b6bd942a811adbf1ac4ab |
30-Aug-2010 |
nobled <nobled@dreamwidth.org> |
st/dri: Add multi-api support Make st/dri screens capable of creating OpenGL ES and OpenGL ES2 contexts. TODO: Figure out the "get_current" problem with multiple st_api's for real. (s/API_OPENGLES1/API_OPENGLES/ by Chia-I Wu)
ommon/dri_context.c
ommon/dri_context.h
ommon/dri_screen.c
ommon/dri_screen.h
rm/dri2.c
|
ecd7ec9d62d2ba919410218f4cf3f69772681f3c |
07-Sep-2010 |
nobled <nobled@dreamwidth.org> |
st/dri: Make clear which API's are supported If the caller requests a GLES context, don't silently create a desktop GL context in its place.
ommon/dri_context.c
|
d473543069b9156ea7a928f17fb15bc70545d4d1 |
23-Aug-2010 |
Chia-I Wu <olv@lunarg.com> |
st/dri: Remove unnecessary main/mtype.h.
ommon/dri_context.h
|
4a5acc0ec7d6d94ea2a73b3d8ee498f75e929a1c |
18-Aug-2010 |
Luca Barbieri <luca@luca-barbieri.com> |
st/dri: use PIPE_TEXTURE_RECT if appropriate
ommon/dri_screen.c
ommon/dri_screen.h
rm/dri2.c
w/drisw.c
|
5c0a0f219843fa283a0fd98dbe0544e8ea820c60 |
11-Aug-2010 |
George Sapountzis <gsapountzis@gmail.com> |
st/dri: make dri_drawable_validate_att static
ommon/dri_drawable.c
ommon/dri_drawable.h
|
c14b4371ed58859d264b7b2581cfedc9cfd8401f |
11-Aug-2010 |
George Sapountzis <gsapountzis@gmail.com> |
st/dri: move TFP code to dri_drawable.c This is based on a patch by nobled <nobled@dreamwidth.org> and allows the TFP extension to be enabled for DRISW also. This patch does not enable TFP for DRISW though, because testing on xephyr segfaults here (for both classic and gallium): Program received signal SIGSEGV, Segmentation fault. 0x00786a4a in _mesa_GenTextures (n=1, textures=0xbfffee4c) at main/texobj.c:788 788 ASSERT_OUTSIDE_BEGIN_END(ctx); (gdb) (gdb) where \#0 0x00786a4a in _mesa_GenTextures (n=1, textures=0xbfffee4c) at main/texobj.c:788 \#1 0x0817a004 in __glXDisp_GenTextures () \#2 0x08168498 in __glXDispatch () \#3 0x0808b6ce in Dispatch () \#4 0x08084435 in main () The TFP code is generic except for the teximage call. We need to verify that DRISW correclty implements whatever hook teximage finally calls.
ommon/dri_drawable.c
ommon/dri_drawable.h
rm/dri2.c
|
5270deaab682c938e360f0d3b52f35b4027db858 |
11-Aug-2010 |
nobled <nobled@dreamwidth.org> |
st/dri: Fix segmentation fault in sw drivers
w/drisw.c
|
d3758feb6b38292d90f4697fa41ea12dce563d5a |
11-Aug-2010 |
George Sapountzis <gsapountzis@gmail.com> |
st/dri: dri_drawable_get_format is shared between DRI2 and DRISW
rm/dri2.c
|
afbf446de5ad91743e2e2a76799bd87f3eed5f9a |
31-Jul-2010 |
Marek Olšák <maraeo@gmail.com> |
st/dri: fix crash when dri2_drawable_get_buffers fails It's easily reproducible with Compiz with its Resize window mode set to Normal (which is usually not the default mode). https://bugs.freedesktop.org/show_bug.cgi?id=28658 https://bugs.freedesktop.org/show_bug.cgi?id=29303 This is actually a workaround to prevent Compiz crashes. Instead, a completely white titlebar might show up during resizing transparent windows (a rare case). The underlying cause should be fixed by someone who has more knowledge about the code. (dri2_drawable_get_buffers should not return NULL) Acked-By: Jakob Bornecrantz <jakob@vmware.com>
rm/dri2.c
|
ca0b0899d8cc20f3e918839e044c55f9a19e9ffe |
31-Jul-2010 |
Vinson Lee <vlee@vmware.com> |
st/dri: Remove unnecessary headers.
ommon/dri_drawable.c
ommon/dri_screen.c
|
873ddf547d5aeb68f37a172d73131c6bc51101f6 |
18-Jul-2010 |
George Sapountzis <gsapountzis@gmail.com> |
st/dri: move backend hooks to appropriate object
ommon/dri_context.h
ommon/dri_drawable.c
ommon/dri_drawable.h
ommon/dri_screen.c
ommon/dri_screen.h
rm/dri2.c
w/drisw.c
|
a30b966f8345cb99922a416fce2da6edb70f864c |
26-May-2010 |
George Sapountzis <gsapountzis@gmail.com> |
st/dri: drop dri1_helper
ommon/dri1_helper.c
ommon/dri1_helper.h
ommon/dri_drawable.c
ommon/dri_drawable.h
ommon/dri_screen.c
ommon/dri_screen.h
rm/Makefile
rm/SConscript
rm/dri1_helper.c
w/Makefile
w/SConscript
w/dri1_helper.c
w/drisw.c
|
2e4ad14a525f4028f0e0a93de2f8db785df33fb7 |
08-Apr-2010 |
George Sapountzis <gsapountzis@gmail.com> |
st/dri: mv driDriverAPI to backends
ommon/dri_screen.c
ommon/dri_screen.h
rm/dri2.c
rm/dri2.h
w/drisw.c
w/drisw.h
|
cc09dc2773a729ab361c58ea5fc70ff070d0b1d2 |
27-Jul-2010 |
Jakob Bornecrantz <wallbraker@gmail.com> |
swrastg: Add SWRAST_NO_PRESENT option to not send updates to X server There seem to be a problem with this path and freeglut where the window wont open if SWRAST_NO_PRESENT is set to true.
w/drisw.c
|
c7ad2a4e79dcb3aadaa26a484feb4cd24c74074d |
19-Jul-2010 |
Chia-I Wu <olv@lunarg.com> |
st/dri: Remove driFrameTrackingExtension. The extension has been removed in 22266c391fbe17603b15a83d4ccf5fa9455ccf8d.
rm/dri2.c
|
14e362c79aedd9b463c74ef2e56ad96101ceb2af |
18-Jul-2010 |
Sven Arvidsson <sa@whiz.se> |
gallium/st/dri2: add dri2 vblank query extension support from bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=28771 Signed-off-by: Dave Airlie <airlied@redhat.com>
rm/dri2.c
|
f9d9574913c5edb92191ac3f5e8d011452427852 |
27-May-2010 |
Jakob Bornecrantz <jakob@vmware.com> |
gallium: Convert state trackers to drm driver interface
ommon/dri_screen.h
rm/dri2.c
w/drisw.c
|
47de9adece49f78c6e4065bedc69ce13272bc120 |
31-May-2010 |
Dave Airlie <airlied@redhat.com> |
gallium: fix TFP on gallium This fixes an uninitialised value use in the dri2 st when doing TFP. It uses the driContextPriv which isn't initialised at alloc time. Signed-off-by: Dave Airlie <airlied@redhat.com>
ommon/dri_context.h
|
67d5a51021cbd4cecb2f1a3bc24fc14435639d49 |
26-May-2010 |
Vinson Lee <vlee@vmware.com> |
st/dri: Remove dri.c from SCons build. This was missed in commit f501230db3a94c9328b8e769d9c17b2c3792e19c. Fixes SCons build.
rm/SConscript
|
b9706886dbc1fd2eb3c671a8ecd3670f7a680fb9 |
25-May-2010 |
Jakob Bornecrantz <jakob@vmware.com> |
drm_api: Remove type argument from create screen callback With the removal of DRI1 support there where no use of this argument, some drivers didn't even properly check it.
rm/dri2.c
|
f501230db3a94c9328b8e769d9c17b2c3792e19c |
25-May-2010 |
Jakob Bornecrantz <jakob@vmware.com> |
st/dri: Remove DRI1 support Nobody used it and the current code had been trough so many changes yet never once being tested.
ommon/dri_screen.c
rm/Makefile
rm/dri1.c
rm/dri1.h
|
4db0c760195c67f1bc114fdfb8464791030a526c |
22-May-2010 |
Jakob Borncrantz <jakob@vmware.com> |
st_api: Give get_egl_image arguments directly to the function
ommon/dri_screen.c
|
a93f9f343a64ce91587af66761399f9d4c180015 |
21-May-2010 |
Jakob Bornecrantz <jakob@vmware.com> |
gallium: Fix invalidate framebuffer with old libGL libraries
ommon/dri_drawable.c
ommon/dri_screen.c
ommon/dri_screen.h
rm/dri2.c
|
5f66363f8ed26d6f3fc8fcccde804fe1fea1bbaa |
21-May-2010 |
Jakob Bornecrantz <jakob@vmware.com> |
st_api: Add get param function to st_manager
ommon/dri_screen.c
|
3293bcdc80cdfa20a2381aae2b94505bdf95d857 |
21-May-2010 |
Roland Scheidegger <sroland@vmware.com> |
Merge branch 'gallium-msaa' Conflicts: src/mesa/state_tracker/st_gen_mipmap.c src/mesa/state_tracker/st_texture.c
|
bf3c8ed481047d0c446d2d3d6d1de82403783fb0 |
17-May-2010 |
Roland Scheidegger <sroland@vmware.com> |
st/dri: adapt to interface changes
ommon/dri1_helper.c
ommon/dri_screen.c
rm/dri1.c
|
8b0c217f2bc123bffd25cc4977d6abb1b3fa8186 |
04-May-2010 |
Brian Paul <brianp@vmware.com> |
gallium: move surface utility functions into u_surface.c This is a better place than in u_rect.c
rm/dri1.c
|
38e3fb23da9f75632992767fa3a01d335b9bb7ab |
02-May-2010 |
Xavier Chantry <chantry.xavier@gmail.com> |
Update dri state tracker to use new API aware context create
ommon/dri_context.c
ommon/dri_context.h
|
296adbd545b8efd38c9ed508166b2de2764a444b |
25-Apr-2010 |
Chia-I Wu <olv@lunarg.com> |
glapi: Move to src/mapi/. Move glapi to src/mapi/{glapi,es1api,es2api}.
rm/Makefile
rm/SConscript
w/Makefile
w/SConscript
|
8fbd66d75a7b58a27ceb16bc23dfa5999cbe7483 |
27-Apr-2010 |
Jakob Bornecrantz <jakob@vmware.com> |
st/dri: Don't check for null when user ensures non-null
ommon/dri_context.c
|
ae79e778f7fae99812ade79ecf5cf3c783d2a93b |
26-Apr-2010 |
Jakob Bornecrantz <jakob@vmware.com> |
st/dri: Use flush function of old context not new
ommon/dri_context.c
|
1372a8f90dc64350e4ac29dbb8c5feb88bc83cd1 |
24-Apr-2010 |
Jakob Bornecrantz <wallbraker@gmail.com> |
st/dri: Refactor dri_st_api into other files
ommon/dri1_helper.c
ommon/dri_context.c
ommon/dri_drawable.c
ommon/dri_drawable.h
ommon/dri_screen.c
ommon/dri_screen.h
ommon/dri_st_api.c
ommon/dri_st_api.h
rm/Makefile
rm/SConscript
rm/dri1.c
rm/dri2.c
rm/dri_st_api.c
w/Makefile
w/SConscript
w/dri_st_api.c
w/drisw.c
|
27779ddad5c61d2fc46367e1556b5e53403c2a97 |
24-Apr-2010 |
Jakob Bornecrantz <wallbraker@gmail.com> |
st/dri: Make st_framebuffer_iface the base for dri_drawable
ommon/dri_context.c
ommon/dri_drawable.c
ommon/dri_drawable.h
ommon/dri_st_api.c
ommon/dri_st_api.h
rm/dri1.c
rm/dri2.c
w/drisw.c
|
a66b391edf746a5eb0cb4aad1ff2e546df00a11d |
24-Apr-2010 |
Jakob Bornecrantz <wallbraker@gmail.com> |
st/dri: Make st_manager the base for dri_screen
ommon/dri_context.c
ommon/dri_context.h
ommon/dri_screen.c
ommon/dri_screen.h
ommon/dri_st_api.c
ommon/dri_st_api.h
rm/dri1.c
w/drisw.c
|
ea6a52a1f8e7fd72b5506218c31e58088131f1f5 |
24-Apr-2010 |
Jakob Bornecrantz <wallbraker@gmail.com> |
st/dri: Add hooks for framebuffer functions
ommon/dri_drawable.c
ommon/dri_drawable.h
ommon/dri_screen.h
ommon/dri_st_api.c
rm/dri1.c
rm/dri1.h
rm/dri2.c
rm/dri2.h
w/drisw.c
w/drisw.h
|
ab12d4f647702f0063c41dd090cef762aa95a0f9 |
24-Apr-2010 |
Jakob Bornecrantz <wallbraker@gmail.com> |
st/dri: Make lookup_egl_image a hook
ommon/dri_screen.h
ommon/dri_st_api.c
rm/dri2.c
rm/dri2.h
|
0c572c6828b6a338b07a6860280b3a314a81662e |
24-Apr-2010 |
Jakob Bornecrantz <wallbraker@gmail.com> |
st_api: Remove st_module The struct st_module isn't needed as it is the same thing as the st_api struct. That is they both represent the API. Instead just use a single function entry point to the the API.
ommon/dri_st_api.c
|
7b7a9e89274d16c7c6c79bf3a0ee2e7c642aaa02 |
25-Apr-2010 |
Vinson Lee <vlee@vmware.com> |
st/dri: Add missing header. Add GL/internal/dri_interface.h for __DRI_TEXTURE_FORMAT_RGB.
rm/dri2.c
|
a523b622036117e8bc1be0a1496d4368562e9702 |
24-Apr-2010 |
Jakob Bornecrantz <wallbraker@gmail.com> |
st/dri: DRI2 give proper binding to depth buffer
rm/dri2.c
|
010f81f32b9e68b768b3436f98953f1d1c0bf1d4 |
18-Apr-2010 |
Vinson Lee <vlee@vmware.com> |
st/dri: Check for NULL before dereference and assignment.
rm/dri1.c
|
53c57191c5f24d3620e2e4ce95dd12b5c6e9109b |
15-Apr-2010 |
Jakob Bornecrantz <wallbraker@gmail.com> |
st/drisw: Stop pretending to be drm_api Reviewed-by: George Sapountzis <gsapountzis@gmail.com>
w/drisw.c
|
39c81dada01585a6030f03d215842a1a2ae87d86 |
14-Apr-2010 |
Jakob Bornecrantz <wallbraker@gmail.com> |
st/dri: Refactor init code a bit Reviewed-by: George Sapountzis <gsapountzis@gmail.com>
ommon/dri_screen.c
ommon/dri_screen.h
rm/dri1.c
rm/dri2.c
w/drisw.c
|
c0301af88310100475987fe7a6ef3955ce81373e |
16-Apr-2010 |
Vinson Lee <vlee@vmware.com> |
st/dri: Remove unnecessary header.
rm/dri1.c
|
9fc93b80413d63aeb08b5a17602d111ed3899faf |
10-Apr-2010 |
José Fonseca <jfonseca@vmware.com> |
scons: Use libdrm options only where needed. Prevents needless recompiles when switching dri=yes to no.
rm/SConscript
|
287c94ea4987033f9c99a2f91c5750c9083504ca |
10-Apr-2010 |
Keith Whitwell <keithw@vmware.com> |
Squashed commit of the following: commit 0189cb2fde9f5d7326fd4bfbc2e52db4cce73b3e Author: Keith Whitwell <keithw@vmware.com> Date: Sat Apr 10 12:48:43 2010 +0100 gallium: don't use generic get_transfer func for textures It doesn't know and can't fill in the stride value. commit 65bc6f88fd9ce8ff90175b250e580bef2739ea35 Author: Chia-I Wu <olv@lunarg.com> Date: Sat Apr 10 13:49:34 2010 +0800 i915g: Initialize screen surface function. commit eb56e64986790aa2fa35534ce652b78656b0c3c5 Merge: f8b0a7f e7f1e5c Author: Keith Whitwell <keithw@vmware.com> Date: Sat Apr 10 00:38:43 2010 +0100 Merge commit 'origin/master' into gallium-resources Conflicts: src/gallium/drivers/r300/r300_texture.c commit f8b0a7f6a3a98fd36ce90a81073ec8c8f09b684c Merge: a3c9980 f43c679 Author: Keith Whitwell <keithw@vmware.com> Date: Sat Apr 10 00:35:09 2010 +0100 Merge commit 'origin/master' into gallium-resources Conflicts: src/gallium/drivers/r300/r300_texture.c commit a3c99807de37dc2c072f1d75ed3a11da333bc9a1 Author: unknown <michal@.(none)> Date: Fri Apr 9 18:51:39 2010 +0200 scons: Add missing sources. commit 927cec79cedb457efa9e6f335727cfcb8e4908e2 Author: Roland Scheidegger <sroland@vmware.com> Date: Fri Apr 9 18:07:56 2010 +0200 gallium: fix another compile warning after merge. Hmpf. commit 52953cd7b0e51deafecb812bdc40f9e45f9ac62a Author: Roland Scheidegger <sroland@vmware.com> Date: Fri Apr 9 18:02:11 2010 +0200 gallium: fix comment commit 7c8763aa6cfc74adf1ea49c2bab25ca17b32575f Author: unknown <michal@.(none)> Date: Fri Apr 9 18:05:20 2010 +0200 util: Fix type cast. commit 9d0086411a104b7cc9297aac0d1f82853118d7bf Author: unknown <michal@.(none)> Date: Fri Apr 9 18:04:33 2010 +0200 libgl-gdi: Use proper unwrap functions for resources. commit 251a5cdd18ba31c690ef61f133dfc65cd4a45cf8 Author: Roland Scheidegger <sroland@vmware.com> Date: Fri Apr 9 17:51:23 2010 +0200 gallium: more comments fixup commit 8f3f9d5e1e9c0de98a3dfb19e81250d2c32ee4e9 Author: Roland Scheidegger <sroland@vmware.com> Date: Fri Apr 9 17:48:18 2010 +0200 gallium: another fix after merge commit 41f00a32ee5be91512c048bacb89ede0e04bc08d Author: Roland Scheidegger <sroland@vmware.com> Date: Fri Apr 9 17:44:30 2010 +0200 gallium: more pipe_texture/resource fixes after merge commit faf53328d1154c51d8a59513f2bfcae62272b0bf Author: Roland Scheidegger <sroland@vmware.com> Date: Fri Apr 9 17:44:24 2010 +0200 gallium: fix comments for changed USAGE flags commit fdcb17bea4b0798d316b56deea69832f41142adf Author: Roland Scheidegger <sroland@vmware.com> Date: Fri Apr 9 16:40:07 2010 +0200 gallium/pb: pb uses PB_USAGE_ flags, not PIPE_TRANSFER_ (same value anyway) commit c95f7278ecc6db417ec1053279f2a8172c47aee9 Author: Keith Whitwell <keithw@vmware.com> Date: Fri Apr 9 13:44:35 2010 +0100 llvmpipe: fix merge glitches commit 28f8b8683175149a381be5eff263d4c20568bce7 Author: Keith Whitwell <keithw@vmware.com> Date: Fri Apr 9 13:41:39 2010 +0100 r300g: update after merge for pipe_resources commit 248c93cbc066ba6e3fadd94c5fcf3bdbb373d8fd Author: Keith Whitwell <keithw@vmware.com> Date: Fri Apr 9 13:41:20 2010 +0100 st/mesa: fix old pipe_texture usages commit a563b1c5c2cb57b3ef28a3654d9b477460d13ced Author: Keith Whitwell <keithw@vmware.com> Date: Fri Apr 9 13:40:56 2010 +0100 r300g: remove unused variable commit 734500131d828c9dfd68c5fa26b3e6b07e086d2d Author: Keith Whitwell <keithw@vmware.com> Date: Fri Apr 9 13:40:36 2010 +0100 nv50: fix compiler warning commit efd402e13037e5c3e29759fa5b1c754c6d65d0e2 Merge: fec8a1d 5452615 Author: Keith Whitwell <keithw@vmware.com> Date: Fri Apr 9 13:33:57 2010 +0100 Merge commit 'origin/master' into gallium-resources Conflicts: src/gallium/drivers/cell/ppu/cell_screen.c src/gallium/drivers/cell/ppu/cell_texture.c src/gallium/drivers/llvmpipe/lp_screen.c src/gallium/drivers/r300/r300_context.c src/gallium/drivers/r300/r300_render.c src/gallium/drivers/r300/r300_screen.c src/gallium/drivers/r300/r300_state.c src/gallium/drivers/r300/r300_texture.c src/gallium/drivers/r300/r300_transfer.c src/gallium/state_trackers/egl/common/egl_g3d.h src/gallium/state_trackers/egl/kms/native_kms.c src/gallium/state_trackers/egl/x11/native_dri2.c src/gallium/state_trackers/egl/x11/native_ximage.c commit fec8a1db13fac04ef56f6ece799d1f20aa3011db Author: Marek Olšák <maraeo@gmail.com> Date: Sat Apr 3 07:58:34 2010 +0200 util: fix assertion failures in pipe_buffer_flush_mapped_range commit 1ff3984c2edce9927744f3cce3e7b07778990170 Author: Roland Scheidegger <sroland@vmware.com> Date: Thu Apr 8 17:44:54 2010 +0200 docs: fix transfer_map description commit 20bf14be8ac6438cb1afa38212e306fc06a5ed40 Author: Keith Whitwell <keithw@vmware.com> Date: Thu Apr 8 14:39:13 2010 +0100 util: fix up several uses of pipe_map_buffer_range This function used to return a pointer to where the start of the actual buffer would have been, even though only the requested range is being mapped. In the resources change, the function was modified to use a transfer internally, and started returning the pointer to the beginning of the transfer, ie the mapped range. Some users of the function were changed to reflect this new behaviour, some were not. Since then the function has reverted to its original behaviour, matching master. This change restores some of the users of the map_buffer_range helper to expect the old/original behaviour. commit 33179a86058b68b518f40971030db337dc26fe6e Author: Keith Whitwell <keithw@vmware.com> Date: Thu Apr 8 14:38:54 2010 +0100 mesa/st: fix up several uses of pipe_map_buffer_range This function used to return a pointer to where the start of the actual buffer would have been, even though only the requested range is being mapped. In the resources change, the function was modified to use a transfer internally, and started returning the pointer to the beginning of the transfer, ie the mapped range. Some users of the function were changed to reflect this new behaviour, some were not. Since then the function has reverted to its original behaviour, matching master. This change restores some of the users of the map_buffer_range helper to expect the old/original behaviour. commit 3f5363d4dc9d7ad48467ae82d58d5f3d9bd10698 Author: Keith Whitwell <keithw@vmware.com> Date: Wed Apr 7 17:26:52 2010 +0100 util: map_range and flush_range have offsets relative to start of buffer commit 7eb1bfb97a790c73188d6b616d54fb3849e69b1e Author: Keith Whitwell <keithw@vmware.com> Date: Wed Apr 7 17:26:08 2010 +0100 nv50: fix compiler warning commit d040daff0642dd791ac38e9b353dc251b03fc873 Author: Keith Whitwell <keithw@vmware.com> Date: Wed Apr 7 17:25:58 2010 +0100 nvfx: fix compiler warning commit 49ec01dffb8e99ab3ff8f856287db7b4df3efed6 Author: Chia-I Wu <olv@lunarg.com> Date: Mon Apr 5 11:58:53 2010 +0800 mesa/es: Fixes for gallium-resources. commit 47c87ada452be45766928a01b6d69da63e3a5f5e Author: Marek Olšák <maraeo@gmail.com> Date: Sat Apr 3 05:19:20 2010 +0200 r300g: fix transfers for textures created from winsys handles commit 5f2701fddaef9c18d85c049311c2819c49cc1ae0 Author: Luca Barbieri <luca@luca-barbieri.com> Date: Sat Apr 3 03:52:38 2010 +0200 nouveau: don't use the staging usage Maybe it could make sense, but for now dynamic is enough. None of these avoid uncached reads from GART on AGP cards. commit 0db20fa49e008f35911007fa7ed9be1d678a2161 Author: Luca Barbieri <luca@luca-barbieri.com> Date: Sat Apr 3 03:27:19 2010 +0200 i965: add brw_resource.c to Makefile commit b94f3e7389cbd1b6465de3c04e8059ce73f1ea1f Author: Luca Barbieri <luca@luca-barbieri.com> Date: Sat Apr 3 01:48:33 2010 +0200 nouveau: fix for gallium-resources commit a01ff99a19986e6beb7903431e60a074945b09bc Author: Roland Scheidegger <sroland@vmware.com> Date: Thu Apr 1 19:26:35 2010 +0200 gallium: fix missing includes commit 26aeded562ce947a6deeb867fe22bf8daf7b1a1a Author: Roland Scheidegger <sroland@vmware.com> Date: Thu Apr 1 19:19:18 2010 +0200 gallium: remove video interface and related stuff These interfaces weren't quite was needed, and building disabled for a while. Some code actually build since some branch merge, and were now not fully converted to gallium-resources. See http://www.mail-archive.com/mesa3d-dev@lists.sourceforge.net/msg09619.html for a discussion of this. Video related work is done in origin/pipe-video branch. commit c64285aea45997a276fb141d7badc8a04f617c7c Author: Roland Scheidegger <sroland@vmware.com> Date: Thu Apr 1 18:45:54 2010 +0200 python: fixes for resource changes doesn't look quite ok yet, but sort of compiles. commit 03d4d5a41f5cf158a358fd705c695e1c987a328f Author: Roland Scheidegger <sroland@vmware.com> Date: Thu Apr 1 18:34:46 2010 +0200 gallium: s/u_box_orgin_2d/u_box_origin_2d commit 2444f023142bcaf7bd310b44794580f273254408 Author: Marek Olšák <maraeo@gmail.com> Date: Thu Apr 1 03:26:50 2010 +0200 r300g: fix segfault when the transfers functions are used Still broken. commit 6f09bf4066ab651b323c131bb07978e700519805 Author: Roland Scheidegger <sroland@vmware.com> Date: Thu Apr 1 00:05:12 2010 +0200 r300g: compile fixes commit 76711ff40d2092f9ef03d452de7458c4e76d9246 Author: Roland Scheidegger <sroland@vmware.com> Date: Thu Apr 1 00:04:47 2010 +0200 nvfx: more compile fixes commit c5d2e90c9cc119447a447dc04a4bce4ab91fc671 Author: Roland Scheidegger <sroland@vmware.com> Date: Wed Mar 31 23:18:50 2010 +0200 gallium: more mostly merge fallout fixes... commit fbc3722696790857f4adc936190406e74dffd969 Merge: 86d9225 d97f696 Author: Roland Scheidegger <sroland@vmware.com> Date: Wed Mar 31 22:09:35 2010 +0200 Merge commit 'origin/master' into gallium-resources Conflicts: src/gallium/drivers/cell/ppu/cell_screen.c src/gallium/drivers/i915/i915_buffer.c src/gallium/drivers/i915/i915_context.h src/gallium/drivers/i915/i915_resource_texture.c src/gallium/drivers/i915/i915_screen.c src/gallium/drivers/i915/i915_state_emit.c src/gallium/drivers/i965/brw_resource_texture.c src/gallium/drivers/llvmpipe/lp_screen.c src/gallium/drivers/llvmpipe/lp_setup.c src/gallium/drivers/nvfx/nv30_fragtex.c src/gallium/drivers/nvfx/nv40_fragtex.c src/gallium/drivers/nvfx/nvfx_miptree.c src/gallium/drivers/nvfx/nvfx_screen.c src/gallium/drivers/nvfx/nvfx_transfer.c src/gallium/drivers/r300/r300_state.c src/gallium/drivers/svga/svga_screen_texture.c src/gallium/state_trackers/dri/common/dri_drawable.c src/gallium/state_trackers/dri/common/dri_screen.c src/gallium/state_trackers/dri/common/dri_st_api.h src/gallium/state_trackers/dri/drm/dri1.c src/gallium/state_trackers/dri/drm/dri1.h src/gallium/state_trackers/dri/drm/dri2.c src/gallium/state_trackers/python/st_device.c src/gallium/state_trackers/python/st_sample.c src/mesa/state_tracker/st_cb_clear.c src/mesa/state_tracker/st_cb_drawpixels.c src/mesa/state_tracker/st_cb_readpixels.c src/mesa/state_tracker/st_cb_texture.c src/mesa/state_tracker/st_extensions.c commit 86d9225d19d194eebbbe95b059695697c3307d15 Author: Roland Scheidegger <sroland@vmware.com> Date: Wed Mar 31 19:06:06 2010 +0200 gallium: more fixes for bind changes commit a215ef0606347e34669a580ec8df93ede7e46399 Author: Roland Scheidegger <sroland@vmware.com> Date: Wed Mar 31 18:48:36 2010 +0200 gallium/docs: some updates for bind changes commit c6c7e6746cbc7af59f7972719ed76f43e8ac16fc Author: Roland Scheidegger <sroland@vmware.com> Date: Tue Mar 30 20:24:26 2010 +0200 gallium: more bind change compile fixes commit a83fa1504b78180524a5eb454ae186741a27cdf8 Author: Roland Scheidegger <sroland@vmware.com> Date: Tue Mar 30 17:37:13 2010 +0200 compile fixes commit 30dc8afcd243d6a160571bac5f06d773e54a4196 Author: Roland Scheidegger <sroland@vmware.com> Date: Tue Mar 30 16:56:28 2010 +0200 fix some merge issues commit 30aa617fee11fe50c0a9c2f33fcd120a474f5e34 Merge: 1dde609 3a830bc Author: Roland Scheidegger <sroland@vmware.com> Date: Tue Mar 30 16:09:45 2010 +0200 Merge commit 'origin/gallium-buffer-usage-cleanup' into gallium-resources Conflicts: src/gallium/drivers/nouveau/nouveau_screen.c src/gallium/drivers/nvfx/nvfx_transfer.c src/gallium/winsys/drm/radeon/core/radeon_drm_buffer.c commit 1dde609ad6c9d2dfa0a5f7167f3c5bcf023b7c4d Author: Roland Scheidegger <sroland@vmware.com> Date: Wed Mar 24 02:35:00 2010 +0100 docs: some updates for pipe_resource commit f236f9660d31b936f54b64ae07e569f8637067bd Author: Luca Barbieri <luca@luca-barbieri.com> Date: Wed Mar 24 01:31:28 2010 +0100 nvfx: fix for gallium-resources It seems to work with basic applications but almost surely needs more work. In particular, it probably shouldn't use PIPE_BUFFER_USAGE_* flags and should use PIPE_TRANSFER_* in several places. Also, we probably don't want the vtable indirect calls and that ought to be replaced with something better instead. commit 5a136ad7b63768cb9a753eff8686c44592e62325 Author: Luca Barbieri <luca@luca-barbieri.com> Date: Wed Mar 24 01:31:19 2010 +0100 nv50: fix build in gallium-resources Not actually tested. Also needs next patch tee to actually build, this is just the nv50 part split from the rest. commit 3a830bc4a3f0f60c925b9434845a6bcad9a913c5 Author: Keith Whitwell <keithw@vmware.com> Date: Tue Mar 23 14:00:52 2010 -0700 st/egl: fix up for binding flags commit c6a80dc32ef17bc972d4137ce7444ebed4d28ebb Author: Keith Whitwell <keithw@vmware.com> Date: Tue Mar 23 13:52:15 2010 -0700 r300: restore 4k alignment for oqbo buffers commit e75a8d5ea9e0ffcf67bc858e08937e10b4fc74ba Author: Keith Whitwell <keithw@vmware.com> Date: Tue Mar 23 13:00:07 2010 -0700 gallium: bind flags commit 1f5b509543a7f399835fd9edf27c18e1643fab7d Author: Roland Scheidegger <sroland@vmware.com> Date: Tue Mar 23 19:32:21 2010 +0100 i965g: scons compile fixes commit 2c385f8f905ec794d9119c05c6293e0b1b9b565a Author: Roland Scheidegger <sroland@vmware.com> Date: Tue Mar 23 19:20:33 2010 +0100 nouveau: drm compile fix commit b285086ebd5132b47c340897c4622cc9fbd286cb Author: Roland Scheidegger <sroland@vmware.com> Date: Tue Mar 23 18:36:19 2010 +0100 r300g: pipe_resource compile fixes bring back mistakenly deleted radeon_buffer.h plus some more commit 7810606f423ef2f51f0a14b919640c2fd2c931aa Author: Michal Krol <michal@vmware.com> Date: Tue Mar 23 16:21:03 2010 +0100 softpipe: Map GS constants, too. commit 366f1176fb89d2b1978da6cfe60000b76bbc7338 Author: Roland Scheidegger <sroland@vmware.com> Date: Tue Mar 23 15:51:52 2010 +0100 failover: update for pipe_resources commit 615f44d70d293704ed821bc0b21fcfe6e363895d Author: Roland Scheidegger <sroland@vmware.com> Date: Tue Mar 23 15:51:02 2010 +0100 identity: remove double is_resource_reference assignment commit 7008586020395905ddfff333d02b3893de369796 Author: Roland Scheidegger <sroland@vmware.com> Date: Tue Mar 23 15:50:32 2010 +0100 trace: compile fix commit 058c5697bda4c9cf7b49d26ee27a34586544efaa Merge: dd7ba13 b33fd3c Author: Keith Whitwell <keithw@vmware.com> Date: Tue Mar 23 06:40:39 2010 -0700 Merge commit 'origin/gallium-resources' into gallium-buffer-usage-cleanup Conflicts: src/gallium/state_trackers/vega/api_filters.c src/mesa/state_tracker/st_cb_drawpixels.c commit b33fd3ce3daf2921a895367d0ed3fd9c718a8575 Author: Michal Krol <michal@vmware.com> Date: Mon Mar 22 21:03:26 2010 +0100 gallium: Usage parameter of get_transfer/transfer_inline_write is a bitfield. commit 9c1162d9d656062a490a529997def3f674cc61fc Author: Michal Krol <michal@vmware.com> Date: Mon Mar 22 20:50:49 2010 +0100 scons: Update file lists after gallium-resources changes. commit af9793ab9e5386b150d6b25c0d1978fdc67172e4 Author: Michal Krol <michal@vmware.com> Date: Mon Mar 22 20:04:39 2010 +0100 gallium: Do not use `template` for formal parameter names. commit dc2e12d714c444af9ff1acdd5a7e91408b116c99 Author: Keith Whitwell <keithw@vmware.com> Date: Sun Mar 21 22:41:34 2010 +0000 ws/nouveau: remove pipe_texture reference commit b94c72329f1be85887d40d49b0586979da469d77 Author: Keith Whitwell <keithw@vmware.com> Date: Sun Mar 21 22:40:41 2010 +0000 ws/xlib: remove pipe_buffer reference in comment commit 0a2af3eeae7de1d1cb433f0a2c35136b115f9920 Author: Keith Whitwell <keithw@vmware.com> Date: Sun Mar 21 22:39:34 2010 +0000 st/vega: clean up reference to pipe_texture commit 437ce98daae46be5d532fbb04c7cbf4a503c1623 Author: Keith Whitwell <keithw@vmware.com> Date: Sun Mar 21 22:39:02 2010 +0000 st/python: begin conversion to pipe_resources, much more to do commit 1b02e1ee3e5e87774f0c9e5f0e1898b7f8de1b16 Author: Keith Whitwell <keithw@vmware.com> Date: Sun Mar 21 22:29:34 2010 +0000 st/xorg: update for pipe_resources commit eb39977fe7a1d9f0c3f4f2d4303a93c2c613cc3b Author: Keith Whitwell <keithw@vmware.com> Date: Sun Mar 21 22:23:51 2010 +0000 st/dri: update for pipe_resources commit e447aeff597a4d8c0f5de25854c14c99f2cc138c Author: Keith Whitwell <keithw@vmware.com> Date: Sun Mar 21 22:23:36 2010 +0000 st/egl: update for pipe_resources commit e4cc48da8fdbd7d521257a6d7cd10e6fc5aa1a65 Author: Keith Whitwell <keithw@vmware.com> Date: Sun Mar 21 22:08:44 2010 +0000 r300: drop use of R300 DONT SYNC flag commit 129a83ab4d32e44ded5faea3f86ae5e1e62cddb6 Author: Keith Whitwell <keithw@vmware.com> Date: Sun Mar 21 22:08:17 2010 +0000 pipebuffer: use transfer flag commit 575b35ee6b683d77095ef21c573c1de207107e79 Merge: f29ac73 9fc6c8b Author: Keith Whitwell <keithw@vmware.com> Date: Sun Mar 21 22:03:25 2010 +0000 Merge commit 'origin/master' into gallium-resources Conflicts: src/gallium/drivers/llvmpipe/lp_texture.c src/gallium/drivers/r300/r300_context.c src/gallium/drivers/r300/r300_texture.c src/gallium/winsys/drm/radeon/core/radeon_buffer.h commit f29ac73f3f626d5779a627b7fa6fecdb60a35aab Author: Keith Whitwell <keithw@vmware.com> Date: Sun Mar 21 18:37:25 2010 +0000 cell: attempt to convert to pipe_resources Can't even compile test this driver. commit 484b1947f4af81bab60b41f21c3c23ea6f67488c Author: Keith Whitwell <keithw@vmware.com> Date: Sun Mar 21 17:25:50 2010 +0000 nvfx: restore usage of pipe_winsys The interface that cannot be killed... commit ac76ac6eb30f4f9aa9f5733d60358b357925953a Author: Keith Whitwell <keithw@vmware.com> Date: Sun Mar 21 17:25:10 2010 +0000 nv50: fix warning commit 9683f4423449fa5acf6c019c571223650473bd82 Author: Keith Whitwell <keithw@vmware.com> Date: Sun Mar 21 17:14:31 2010 +0000 util: restore u_simple_screen, nouveau still relies on it commit 961cbcb62232689c959965384c6aa9b8eca697c1 Author: Keith Whitwell <keithw@vmware.com> Date: Sun Mar 21 16:51:54 2010 +0000 nouveau: convert nvfx and nv50 to pipe_resources Compile tested only. This was a deeper change than I was hoping for, due to the layering of the pipe_texture implementation in each driver on top of a shared pipe_buffer implementation in the shared code. Have modified the shared code to act as a set of convenience routines operating on nouveau_bo objects. Each driver now uses the u_resource_vtbl technique to split the implementation of pipe_resources between the existing miptree code for textures and a new, minimal buffer implementation in each driver. Eventually these should be combined, not least because APIs are now allowing things like binding buffer resources as textures and render targets. commit 18ba74016db13b23282f5033ee37b628a12ee566 Author: Keith Whitwell <keithw@vmware.com> Date: Sun Mar 21 10:02:54 2010 +0000 r300: fix compilation after merge Also build r300 by default. commit eb9c0175c8e4baca3fcb0b8364f83ceba9d74e0d Author: Keith Whitwell <keithw@vmware.com> Date: Sun Mar 21 09:59:49 2010 +0000 st/vega: fix up after merge commit ea8dd1d4ae7b58c9315c3491046ef3852ddd3377 Author: Keith Whitwell <keithw@vmware.com> Date: Sun Mar 21 09:59:44 2010 +0000 aux: remove unused piperesource helpers commit be7af29d3ad1a10409b0ea689d882cf30a4e1d62 Merge: d22c2c6 12deb9e Author: Keith Whitwell <keithw@vmware.com> Date: Sun Mar 21 09:54:53 2010 +0000 Merge commit 'origin/master' into gallium-resources Conflicts: src/gallium/auxiliary/cso_cache/cso_context.c src/gallium/auxiliary/cso_cache/cso_context.h src/gallium/drivers/r300/r300_context.c src/gallium/drivers/r300/r300_render.c src/gallium/drivers/r300/r300_state.c src/gallium/drivers/r300/r300_state_derived.c src/gallium/state_trackers/vega/api_filters.c src/gallium/state_trackers/vega/image.c src/gallium/state_trackers/vega/image.h src/gallium/state_trackers/vega/mask.c src/gallium/state_trackers/vega/mask.h src/gallium/state_trackers/vega/paint.c src/gallium/state_trackers/vega/paint.h src/gallium/state_trackers/vega/renderer.c src/gallium/state_trackers/vega/renderer.h src/gallium/state_trackers/vega/shader.c src/gallium/state_trackers/vega/vg_context.h src/gallium/state_trackers/vega/vg_tracker.c src/mesa/state_tracker/st_manager.c commit d22c2c6cb23a063e3334a165d0c5c3d73f05d234 Author: Keith Whitwell <keithw@vmware.com> Date: Sat Mar 20 11:48:54 2010 +0000 drm/r300: update for r300g pipe_resources conversion Remove old files that related to pipe_buffers but weren't being built. Hopefully this is correct. commit f07b2c836958bee5796899123eca4ed05ac6242b Author: Keith Whitwell <keithw@vmware.com> Date: Sat Mar 20 11:47:03 2010 +0000 r300: convert to pipe_resources Do a very shallow conversion - basically keeping the existing buffer and texture code intact and using a vtbl struct inside our resource struct to select between the two implementations. The buffer and texture treatments could be further merged without much effort, but try to keep the existing code working at this point. commit feca9c3ca62daaf0d8745370106d4e3b22340c49 Author: Keith Whitwell <keithw@vmware.com> Date: Thu Mar 18 06:00:34 2010 +0000 gallium: update new merges to pipe_resource commit 1cad983eac77a0c5333e6a3ce92b90ac87407714 Author: Keith Whitwell <keithw@vmware.com> Date: Thu Mar 18 06:00:19 2010 +0000 drm/sw: update new merges to pipe_resource commit 191d39490ed792c569f98d42cf05891b264f71f8 Author: Keith Whitwell <keithw@vmware.com> Date: Thu Mar 18 06:00:01 2010 +0000 vg: update new merges to pipe_resource commit b727c59bc44812ad503d9390505c92b738a5b8b0 Author: Keith Whitwell <keithw@vmware.com> Date: Thu Mar 18 05:59:38 2010 +0000 llvmpipe: update new merges to pipe_resource commit 5f4b64b37fdcd70162c382b2ebbd494bef751dbd Author: Keith Whitwell <keithw@vmware.com> Date: Thu Mar 18 05:59:23 2010 +0000 brw: pipe_resource fixes commit d4aca209f531f1b65bf706ce1e5fc0375b587eb6 Author: Keith Whitwell <keithw@vmware.com> Date: Thu Mar 18 05:59:06 2010 +0000 util: update new merges to pipe_resource commit cf6bef0afee10763c78509a3d17e9a6e49bcd3c8 Merge: 1997231 6de8e56 Author: Keith Whitwell <keithw@vmware.com> Date: Thu Mar 18 05:38:50 2010 +0000 Merge commit 'origin/master' into gallium-resources commit 1997231916144485c3c4a36f53eda39fce460272 Merge: ad88ac7 e1ee3ea Author: Keith Whitwell <keithw@vmware.com> Date: Wed Mar 17 08:46:38 2010 +0000 Merge commit 'origin/master' into gallium-resources Conflicts: src/gallium/auxiliary/Makefile src/gallium/auxiliary/util/u_blit.c src/gallium/auxiliary/util/u_blit.h src/gallium/auxiliary/util/u_gen_mipmap.c src/gallium/auxiliary/util/u_gen_mipmap.h src/mesa/state_tracker/st_cb_texture.c src/mesa/state_tracker/st_gen_mipmap.c commit ad88ac79034a91670940276e722bdd398d5c9023 Merge: 77bc770 8cdfd12 Author: Keith Whitwell <keithw@vmware.com> Date: Tue Mar 16 09:13:07 2010 +0000 Merge branch 'gallium-sampler-view' into gallium-resources Conflicts: src/gallium/auxiliary/cso_cache/cso_context.c src/gallium/auxiliary/util/u_blit.c src/gallium/drivers/llvmpipe/lp_texture.c src/gallium/drivers/softpipe/sp_texture.c src/mesa/state_tracker/st_cb_fbo.c src/mesa/state_tracker/st_framebuffer.c src/mesa/state_tracker/st_texture.c commit 77bc770c991ea025c82eaa4e0e2390efd825d96d Author: Keith Whitwell <keithw@vmware.com> Date: Mon Mar 15 22:21:48 2010 +0000 util: missing file commit f83c91db8ae63a3c3a34ff21492427a5663fb760 Merge: c1d4774 42910eb Author: Keith Whitwell <keithw@vmware.com> Date: Mon Mar 15 09:48:58 2010 +0000 Merge commit 'origin/gallium-sampler-view' into gallium-resources Conflicts: src/gallium/drivers/nv40/nv40_transfer.c src/gallium/drivers/nvfx/nvfx_transfer.c src/gallium/drivers/trace/tr_drm.c commit dd7ba1378fc50710667724d30d6d4cf1125ad61e Author: Keith Whitwell <keithw@vmware.com> Date: Sun Mar 14 23:54:36 2010 +0000 gallium: start a cleanup of buffer_usage Remove fairly meaningless CPU/GPU READ/WRITE flags and replace with proper usages. commit c1d4774187189f4af8ff421b210824f3d53ceefb Author: Keith Whitwell <keithw@vmware.com> Date: Sun Mar 14 23:05:45 2010 +0000 llvmpipe: don't FREE userbuffer data commit 9bfa07afe179f8060e7beefb754a29c4d9c6e349 Merge: 65757a1 08cddfe Author: Keith Whitwell <keithw@vmware.com> Date: Sun Mar 14 22:54:51 2010 +0000 Merge commit 'origin/master' into gallium-resources Conflicts: src/gallium/drivers/llvmpipe/lp_rast.c src/gallium/drivers/llvmpipe/lp_scene.c src/gallium/drivers/llvmpipe/lp_texture.c src/gallium/drivers/llvmpipe/lp_texture.h src/gallium/drivers/softpipe/sp_texture.c src/gallium/drivers/svga/svga_screen_texture.c commit 65757a143f8e3fcd7afbc1ff92db44a823edf46c Author: Keith Whitwell <keithw@vmware.com> Date: Sun Mar 14 22:41:17 2010 +0000 svga: build fixes commit 2f5435220501d4b3050cab2bb1dce6174cd13ff6 Author: Keith Whitwell <keithw@vmware.com> Date: Sun Mar 14 22:39:25 2010 +0000 gallivm: build fix commit 42642ec0984107d82b740711f2debbf38457a06e Author: Keith Whitwell <keithw@vmware.com> Date: Sun Mar 14 22:38:33 2010 +0000 llvmpipe: convert to pipe_resources commit 7bbcb21e20cb545ef8dd5fc61d67ed931c69e813 Author: Keith Whitwell <keithw@vmware.com> Date: Sun Mar 14 22:19:30 2010 +0000 gallivm: convert to pipe_resources commit 88ae0d04610ca52649b42e32141a52af6d5a739b Author: Keith Whitwell <keithw@vmware.com> Date: Sun Mar 14 21:01:22 2010 +0000 configs: build svga commit 0e112bc69828e65085ebfaef895ecd78fe53f1c4 Author: Keith Whitwell <keithw@vmware.com> Date: Sun Mar 14 21:01:17 2010 +0000 gallium: restore PIPE_BUFFER_USAGE_CUSTOM commit 102aca688b95c976b7178b84092fba7d041ff9d2 Author: Keith Whitwell <keithw@vmware.com> Date: Sun Mar 14 21:00:41 2010 +0000 util: more transfer helpers commit a79f6a4a0836fc64c07f9aeec21d914474fe3649 Author: Keith Whitwell <keithw@vmware.com> Date: Sun Mar 14 20:59:36 2010 +0000 svga: convert to use pipe_resrource As with others so far, a fairly shallow conversion. commit 087fb54492fa5e3baf040c5efbf7dacd98a8849b Author: Keith Whitwell <keithw@vmware.com> Date: Sun Mar 14 18:38:08 2010 +0000 brw: fix function name commit cfc9dd707d16e06fd23b6926da3a6e2269f31dc8 Author: Keith Whitwell <keithw@vmware.com> Date: Sun Mar 14 18:19:06 2010 +0000 gallium: enable brw compile commit 8a5b86d76bdd3c7de63322423f59940a4dc2ee25 Author: Keith Whitwell <keithw@vmware.com> Date: Sun Mar 14 18:18:50 2010 +0000 brw: compiles with pipe_resource commit 563ca458b548c41ca4dca559354c16ca1a80d009 Author: Keith Whitwell <keithw@vmware.com> Date: Sun Mar 14 18:18:42 2010 +0000 i915: hook up userbuffer create commit b5095b48247b6020e36cc942ac145c3fccbe9a19 Author: Keith Whitwell <keithw@vmware.com> Date: Sun Mar 14 17:20:51 2010 +0000 i915: use helpers for is_resource_referenced commit d5392bdc6d70002acf9c5bac0fde14ba405c4d84 Author: Keith Whitwell <keithw@vmware.com> Date: Sun Mar 14 17:20:38 2010 +0000 util: helpers for is_resource_referenced commit 2f3492a5aefbb2e745f6700d8e910ebb5cbb98cf Author: Keith Whitwell <keithw@vmware.com> Date: Sun Mar 14 17:08:50 2010 +0000 i915: remove buffer.c again commit 1373a35b65fcc25ec6cdfea2703bbb3417de2c6d Author: Keith Whitwell <keithw@vmware.com> Date: Sun Mar 14 17:08:34 2010 +0000 i915: add new files to scons commit 0251612d70e57fe38e10e75915b394631d224f2c Author: Keith Whitwell <keithw@vmware.com> Date: Sun Mar 14 16:38:29 2010 +0000 i915: compiling with pipe_resources commit 9a0235864252929a8eedd44dbd2fe30fe54c531d Author: Keith Whitwell <keithw@vmware.com> Date: Sun Mar 14 13:51:16 2010 +0000 gallium: remove inline_read transfer commit a6ba315e25793e0c228d3a4ae2f8201634dc9ff0 Author: Keith Whitwell <keithw@vmware.com> Date: Sun Mar 14 13:50:32 2010 +0000 trace: get running Some dumping will be incorrect or disabled, but it runs without crashing commit 2133f1d90aa919662a8420a0cf3b4557e6ec1afd Author: Keith Whitwell <keithw@vmware.com> Date: Sun Mar 14 13:49:42 2010 +0000 gallium: remove the inline_read transfer There aren't enough users of this to justify it. commit bccaf1fa30881f6b4fb189a9b74fc7af79c3b481 Author: Keith Whitwell <keithw@vmware.com> Date: Sun Mar 14 12:30:37 2010 +0000 identity: hook up inline transfer operations commit e4c152a344f2f53c842b810724a2ae7cb4554f58 Author: Keith Whitwell <keithw@vmware.com> Date: Sun Mar 14 12:21:54 2010 +0000 gallium: build trace and identity commit 0b5a311db78852fa9fd021e17b5968a1e0436b49 Author: Keith Whitwell <keithw@vmware.com> Date: Sun Mar 14 12:21:36 2010 +0000 gallium: add more of the transfer state to pipe_transfer Not really sure if recording all the arguments to the create_{transfer,texture,surface,etc} functions in the result of those calls is a great idea, but it seems we're fairly dependent on it throughout the code. commit a23985c26eafe76b0a7dacc892e50cb589f211fe Author: Keith Whitwell <keithw@vmware.com> Date: Sun Mar 14 12:19:46 2010 +0000 identity: compiles with pipe_resources commit d0d630944304c208f6dade6ef8836763ee2bc7b4 Author: Keith Whitwell <keithw@vmware.com> Date: Sun Mar 14 12:13:02 2010 +0000 trace: compiles with pipe_resources commit a4451ea459cc8bfc915fe6aed2891b90854b6c9d Author: Keith Whitwell <keithw@vmware.com> Date: Sun Mar 14 11:39:50 2010 +0000 softpipe: give userbuffers a format other than NONE Most mesa demos working commit 32bb1bd4ba29884a4ecfa11c8441d33dfceabcef Author: Keith Whitwell <keithw@vmware.com> Date: Sun Mar 14 11:39:21 2010 +0000 util: correct argument order in pipe_buffer_map commit 7e2696c06445282feb781047277b260308760a33 Author: Keith Whitwell <keithw@vmware.com> Date: Sun Mar 14 11:32:55 2010 +0000 softpipe: transfer flush commit a0543b13c042e3c1142522d9d136f16fd4cabf78 Author: Keith Whitwell <keithw@vmware.com> Date: Sun Mar 14 11:32:13 2010 +0000 util: noop implementation of transfer_flush_region commit ce418533be752dbeb164e7ff82a99483048e482b Author: Keith Whitwell <keithw@vmware.com> Date: Sun Mar 14 11:26:07 2010 +0000 gallium: softpipe runs gears with pipe_resources commit bfda4f2eb34498e4b7f3c608d30fccff6bb9651b Author: Keith Whitwell <keithw@vmware.com> Date: Sun Mar 14 11:25:48 2010 +0000 util: get clip_tile working again commit f5ef219c3bed62b6a0da842e675fae16268e0fbe Author: Keith Whitwell <keithw@vmware.com> Date: Sun Mar 14 09:43:20 2010 +0000 softpipe: use u_transfer helpers commit 072957aab25affecf0702e925310e46c694a5ee4 Author: Keith Whitwell <keithw@vmware.com> Date: Sun Mar 14 09:42:46 2010 +0000 util: helpers for inline transfers commit 9c45561fb0d7a52400093bcb2ce5f727fafd7777 Author: Keith Whitwell <keithw@vmware.com> Date: Sun Mar 14 09:42:25 2010 +0000 util: fix typo calculating transfer box commit f3e98fd47f36804d019a684d49ff230df3ab0cf5 Author: Keith Whitwell <keithw@vmware.com> Date: Sun Mar 14 09:25:46 2010 +0000 st/vega: convert to pipe_resource commit d1b7b00afc944f6499c83d676c7642115d62a62c Author: Keith Whitwell <keithw@vmware.com> Date: Sun Mar 14 08:37:56 2010 +0000 gallium: begin converting drivers to pipe_resource Work in progress... commit 51c25117f5d6da1926a2be5ecc66677952a8abf0 Author: Keith Whitwell <keithw@vmware.com> Date: Sat Mar 13 20:16:27 2010 +0000 gallium: work in progress on layering resources on top of old textures Helper code in an aux module to avoid rewriting all the drivers. commit fb6764d3ce95c55aa78af2f1c8cbb17b79ce1ba2 Author: Keith Whitwell <keithw@vmware.com> Date: Sat Mar 13 19:19:09 2010 +0000 heaps of wip commit ee6b3bc730fcdaf8da3646d62f04578ec06d36a1 Author: Keith Whitwell <keithw@vmware.com> Date: Sat Mar 13 16:38:02 2010 +0000 wip2 commit 1830880212445189fe267d615075239ed17c7cc0 Merge: 90b4045 47bfbd4 Author: Keith Whitwell <keithw@vmware.com> Date: Sat Mar 13 15:14:03 2010 +0000 Merge branch 'gallium-sampler-view' into gallium-resources Conflicts: src/gallium/include/pipe/p_context.h src/mesa/state_tracker/st_atom_texture.c src/mesa/state_tracker/st_cb_bitmap.c src/mesa/state_tracker/st_cb_drawpixels.c src/mesa/state_tracker/st_cb_texture.c src/mesa/state_tracker/st_context.c src/mesa/state_tracker/st_context.h src/mesa/state_tracker/st_texture.h commit 90b4045fbc0a093fcd04efba7e045ec259c490b8 Author: Keith Whitwell <keithw@vmware.com> Date: Sat Mar 13 14:52:43 2010 +0000 wip
ommon/dri1_helper.c
ommon/dri1_helper.h
ommon/dri_drawable.h
ommon/dri_screen.c
ommon/dri_st_api.c
ommon/dri_st_api.h
rm/dri1.c
rm/dri2.c
w/drisw.c
|
ba81b0743efd978509b1931d7b4b93f37e8aeb5e |
09-Apr-2010 |
Chia-I Wu <olv@lunarg.com> |
Fix copyright headers. Update the warranty disclaimer to use the more general "THE AUTHORS OR COPYRIGHT HOLDERS". This is done manually on files created by me. Hope that I do not miss anything.
ommon/dri_st_api.c
ommon/dri_st_api.h
|
968bf9634ec03e61441834603f13f0c914bbb0ce |
05-Apr-2010 |
Chia-I Wu <olv@lunarg.com> |
st/dri: Fix setTexBuffer2 with __DRI_TEXTURE_FORMAT_RGB. When the format is __DRI_TEXTURE_FORMAT_RGB, the texture should be treated as if there is no alpha channel.
rm/dri2.c
|
7915151f2d05e175d00e739e9a3fead922e60096 |
06-Apr-2010 |
Chia-I Wu <olv@lunarg.com> |
st/dri: Implement DRI image extension.
ommon/dri_st_api.c
ommon/dri_st_api.h
rm/dri2.c
rm/dri2.h
|
1d11ba0ba3d3919bdee62a6513bc0c0d1e68aa66 |
02-Apr-2010 |
Yann Droneaud <yann@droneaud.fr> |
gallium: fix dri_destroy_option_cache() when optionCache.info is NULL With an Intel 855GM handled by intel_drv, there's a crash with Gallium3D enabled DRI driver for Intel i915 (--enable-gallium-intel). The Gallium3D driver doesn't support the 855GM as expected by intel_drv, it failed to open the screen and give an half initialized screen structure to dri_destroy_option_cache(): optionCache.info is NULL, so it's crashing while trying to free array content. This patch at least fix the crash in the function. Here's some logs of the fixed version: [ 16274.137] LoaderOpen(/opt/mesa/lib/xorg/modules/drivers/intel_drv.so) [ 16274.139] (II) Loading /opt/mesa/lib/xorg/modules/drivers/intel_drv.so [ 16274.183] (II) Module intel: vendor="X.Org Foundation" [ 16274.183] compiled for 1.8.0, module version = 2.11.0 [ 16274.183] Module class: X.Org Video Driver [ 16274.183] ABI class: X.Org Video Driver, version 7.0 [ 16274.183] (II) intel: Driver for Intel Integrated Graphics Chipsets: i810, i810-dc100, i810e, i815, i830M, 845G, 852GM/855GM, 865G, 915G, E7221 (i915), 915GM, 945G, 945GM, 945GME, Pineview GM, Pineview G, 965G, G35, 965Q, 946GZ, 965GM, 965GME/GLE, G33, Q35, Q33, GM45, 4 Series, G45/G43, Q45/Q43, G41, B43, Clarkdale, Arrandale [ 16274.382] (II) intel(0): Integrated Graphics Chipset: Intel(R) 855GME [ 16274.382] (--) intel(0): Chipset: "852GM/855GM" [ 16276.675] (II) intel(0): [DRI2] Setup complete [ 16276.675] (II) intel(0): [DRI2] DRI driver: i915 debug_get_option: GALLIUM_TRACE = (null) debug_get_bool_option: GALLIUM_RBUG = FALSE debug_get_bool_option: INTEL_DUMP_CMD = FALSE i915_create_screen: unknown pci id 0x3582, cannot create screen dri_init_screen_helper: failed to create pipe_screen [ 16276.794] (EE) AIGLX error: Calling driver entry point failed [ 16276.794] (EE) AIGLX: reverting to software rendering [ 16276.794] (II) AIGLX: Screen 0 is not DRI capable [ 16276.796] (II) AIGLX: Loaded and initialized /opt/mesa/lib/dri/swrast_dri.so [ 16276.796] (II) GLX: Initialized DRISWRAST GL provider for screen 0 Signed-off-by: Yann Droneaud <yann@droneaud.fr> Reviewed-by: Corbin Simpson <MostAwesomeDude@gmail.com>
ommon/dri_screen.c
|
d97f6963aee71d8fafa2a94a5fe1f3ca4b4ef16d |
31-Mar-2010 |
Roland Scheidegger <sroland@vmware.com> |
Merge branch 'gallium-new-formats' Conflicts: src/gallium/auxiliary/util/u_format.csv src/gallium/auxiliary/util/u_format_access.py src/gallium/auxiliary/util/u_format_pack.py
|
5123e33863ac37242eb5e867cd0a38fecbd06b48 |
31-Mar-2010 |
Vinson Lee <vlee@vmware.com> |
st/dri: Remove unnecessary header.
ommon/dri_drawable.c
|
91454fb94d76d2984081bbe56e1de08de8bc100c |
31-Mar-2010 |
Vinson Lee <vlee@vmware.com> |
st/dri: Remove unnecessary header.
ommon/dri_st_api.c
|
aa1a79036003c2aeaae24877da66e9b46a059cad |
30-Mar-2010 |
Chia-I Wu <olv@lunarg.com> |
st/dri: Fix a memory leak in dri1_init_screen. Free the returned configs upon errors.
rm/dri1.c
|
49289007c1fb7609a1c37aeb2daeeb96a47b8438 |
30-Mar-2010 |
Vinson Lee <vlee@vmware.com> |
drisw: Remove unnecessary header.
w/drisw.c
|
733df0059f04e3fd7e3265d3c80dd8029f939c60 |
30-Mar-2010 |
Roland Scheidegger <sroland@vmware.com> |
Merge branch 'master' into gallium-new-formats Conflicts: src/gallium/auxiliary/util/u_format.csv
|
6fb364a1717858d8201b2caf234076ce5d4832ac |
30-Mar-2010 |
Roland Scheidegger <sroland@vmware.com> |
gallium: adapt all code to the renamed depth/stencil formats
ommon/dri_screen.c
|
625e024b186829f199458679921916971a5b00cb |
29-Mar-2010 |
George Sapountzis <gsapountzis@gmail.com> |
st/dri/sw: add drisw_api similarly to dri1_api I am pretty sure that this is in gallium spirit, so commit. Thanks to Chia-I for suggesting this.
ommon/dri_st_api.c
rm/dri1.c
w/drisw.c
w/drisw.h
|
a24fc90703f62d286031cb2ee8f625ef728243fd |
28-Mar-2010 |
George Sapountzis <gsapountzis@gmail.com> |
drisw: probably better hack for stride and some comments
w/drisw.c
|
f4e561ce127cf484d7c76c29b8cd026c9ad5cebc |
27-Mar-2010 |
George Sapountzis <gsapountzis@gmail.com> |
drisw: make stride issue profound
w/drisw.c
|
03832881325348871db1dad613bdcf8f4265a240 |
27-Mar-2010 |
Vinson Lee <vlee@vmware.com> |
st/dri: Fix SCons build. This was missed in commit 4b722bf9fde668dff1c2b55b34eb3f86c78f43fb. dri_extensions.c was removed from Makefile but not from SConscript.
rm/SConscript
w/SConscript
|
3ae082f00cad3f2323a3747fe3b6f02b8f8c5285 |
26-Mar-2010 |
George Sapountzis <gsapountzis@gmail.com> |
swrastg: allow for any of the software rasterizers. This function should be put in targets/common or winsys/sw/common and shared with targers/libgl-xlib and winsys/sw/drm. For targets/common, you get layering violations in the build system unless all of drm_api's are moved under targets.
w/drisw.c
|
fc35d203c70a89b723e5ebeff1918e7607d67a79 |
26-Mar-2010 |
George Sapountzis <gsapountzis@gmail.com> |
st/dri: add comment about the ifdef in dri_screen.c
ommon/dri_screen.c
|
5b07257fdbb5a93f432b8eaf3a41f39b26bdb1f3 |
26-Mar-2010 |
George Sapountzis <gsapountzis@gmail.com> |
st/dri: factor out common init_screen code
ommon/dri_screen.c
ommon/dri_screen.h
rm/dri1.c
rm/dri2.c
w/drisw.c
|
1fbfc22d8560c9d900832147f504ff64c64358de |
26-Mar-2010 |
George Sapountzis <gsapountzis@gmail.com> |
st/dri mv __driDriverExtensions to drisw.c and dri2.c
ommon/dri_screen.c
rm/dri2.c
w/drisw.c
|
4b722bf9fde668dff1c2b55b34eb3f86c78f43fb |
26-Mar-2010 |
George Sapountzis <gsapountzis@gmail.com> |
st/dri: fold dri_extensions.c into dri_context.c
ommon/dri_context.c
ommon/dri_context.h
ommon/dri_extensions.c
rm/Makefile
rm/dri_extensions.c
w/Makefile
w/dri_extensions.c
|
7f91f2efb5b92a9ad8506c54643142f40f286d5c |
26-Mar-2010 |
Jakob Bornecrantz <wallbraker@gmail.com> |
swrastg: Build with scons
Conscript
w/SConscript
|
80672e84cf79ab12b7a4ff56567184d1c39baef3 |
25-Mar-2010 |
Jakob Bornecrantz <wallbraker@gmail.com> |
st/dri: Move common files to common directory 27 files changed, 15 insertions(+), 15 deletions(-) rename src/gallium/state_trackers/dri/{ => common}/dri1_helper.c (100%) rename src/gallium/state_trackers/dri/{ => common}/dri1_helper.h (100%) rename src/gallium/state_trackers/dri/{ => common}/dri_context.c (100%) rename src/gallium/state_trackers/dri/{ => common}/dri_context.h (100%) rename src/gallium/state_trackers/dri/{ => common}/dri_drawable.c (100%) rename src/gallium/state_trackers/dri/{ => common}/dri_drawable.h (100%) rename src/gallium/state_trackers/dri/{ => common}/dri_extensions.c (100%) rename src/gallium/state_trackers/dri/{ => common}/dri_screen.c (100%) rename src/gallium/state_trackers/dri/{ => common}/dri_screen.h (100%) rename src/gallium/state_trackers/dri/{ => common}/dri_st_api.c (100%) rename src/gallium/state_trackers/dri/{ => common}/dri_st_api.h (100%) rename src/gallium/state_trackers/dri/{ => common}/dri_wrapper.h (100%)
ommon/dri1_helper.c
ommon/dri1_helper.h
ommon/dri_context.c
ommon/dri_context.h
ommon/dri_drawable.c
ommon/dri_drawable.h
ommon/dri_extensions.c
ommon/dri_screen.c
ommon/dri_screen.h
ommon/dri_st_api.c
ommon/dri_st_api.h
ommon/dri_wrapper.h
ri1_helper.c
ri1_helper.h
ri_context.c
ri_context.h
ri_drawable.c
ri_drawable.h
ri_extensions.c
ri_screen.c
ri_screen.h
ri_st_api.c
ri_st_api.h
ri_wrapper.h
rm/Makefile
rm/SConscript
rm/dri1_helper.c
rm/dri_extensions.c
rm/dri_st_api.c
w/Makefile
w/dri1_helper.c
w/dri_extensions.c
w/dri_st_api.c
|
5b1fc14627ae37c5def70e2d5fe28bf7a4becee6 |
25-Mar-2010 |
Jakob Bornecrantz <wallbraker@gmail.com> |
st/dri: Reshuffle files and make it obvious which files are shared In short: git mv ../drisw/Makefile dri/sw git mv drisw.[c|h] sw git mv dri2.[c|h] dri1.[c|h] Makefile drm git rm ../drisw ln -s <common files> drm/* ln -s <common files> sw/*
akefile
Conscript
ommon/dri_context.c
ommon/dri_drawable.c
ommon/dri_screen.c
ri1.c
ri1.h
ri2.c
ri2.h
risw.c
risw.h
rm/Makefile
rm/SConscript
rm/dri1.c
rm/dri1.h
rm/dri1_helper.c
rm/dri2.c
rm/dri2.h
rm/dri_extensions.c
rm/dri_st_api.c
w/Makefile
w/dri1_helper.c
w/dri_extensions.c
w/dri_st_api.c
w/drisw.c
w/drisw.h
|
9eaadfeaa54d15fc3eb90d4137795ace4f920b2f |
25-Mar-2010 |
Jakob Bornecrantz <wallbraker@gmail.com> |
st/dri: Don't include sw vs drm dri headers
ri_screen.c
ri_st_api.c
|
8f47f5320f1a8d4750152f7783cf72073d0979bd |
25-Mar-2010 |
Jakob Bornecrantz <wallbraker@gmail.com> |
st/dri: Add dri2 prefix for all dri2.c functions
ri2.c
ri2.h
ri_screen.c
ri_st_api.c
|
1570e30b487018f056af4d0b5ca83a889f9ce721 |
25-Mar-2010 |
George Sapountzis <gsapountzis@gmail.com> |
st/dri: add TODO list for DRISW
risw.c
|
5b75e12f9165c890fd14b22983d6289be8f20abc |
25-Mar-2010 |
George Sapountzis <gsapountzis@gmail.com> |
st/dri: add drisw
ri_screen.c
ri_screen.h
ri_st_api.c
risw.c
risw.h
|
1bed0eb98e00ed9ea7431f19ab3bed8860864264 |
25-Mar-2010 |
George Sapountzis <gsapountzis@gmail.com> |
st/dri: add dri_wrapper.h
ri1.h
ri2.h
ri_context.c
ri_context.h
ri_screen.h
ri_wrapper.h
|
4ce16e13ce5ca89943b86a8e8cdb5354892a13a6 |
25-Mar-2010 |
George Sapountzis <gsapountzis@gmail.com> |
st/dri: export DRI1 surface / pipe They will be used by DRISW. Also, add destroy functions.
akefile
Conscript
ri1.c
ri1.h
ri1_helper.c
ri1_helper.h
ri_drawable.c
ri_screen.c
ri_st_api.c
|
6a7bd8eb95e7d304725b09272dc9c40a337182e1 |
25-Mar-2010 |
George Sapountzis <gsapountzis@gmail.com> |
st/dri: split out DRI2 code
akefile
Conscript
ri2.c
ri2.h
ri_drawable.c
ri_drawable.h
ri_screen.c
ri_screen.h
ri_st_api.c
|
96c152b4b066f6e3583821ad44ec8a527ab55e05 |
25-Mar-2010 |
George Sapountzis <gsapountzis@gmail.com> |
st/dri: make get_texture into validate_att This is a wrapper around dri_st_framebuffer_validate for a single attachment. Also, call validate through hook to make it more generic.
ri_drawable.c
ri_st_api.c
ri_st_api.h
|
a21c30308db206467a54394b1ddda444861ee9b6 |
25-Mar-2010 |
George Sapountzis <gsapountzis@gmail.com> |
st/dri: flush_frontbuffer, allocate_textures for dri2 dri_st_framebuffer functions just forward to dri1/dri2 functions.
ri_st_api.c
|
24056e76637c9d79d996c6bc060576907bd9b2aa |
25-Mar-2010 |
George Sapountzis <gsapountzis@gmail.com> |
st/dri: flush_frontbuffer, allocate_textures for dri1 * ptex is get by flush_frontbuffer, similar to swap_buffers * comment for allocate_textures * texture_mask is managed at the st_fb level
ri1.c
ri1.h
ri_st_api.c
|
03c4573ecaeedc8439ebbdfe90f7873fcd9706a1 |
25-Mar-2010 |
George Sapountzis <gsapountzis@gmail.com> |
st/dri: minor cosmetic for buffers
ri_st_api.c
|
c049d58a229125ce7ad61c645902eb2638e87194 |
25-Mar-2010 |
George Sapountzis <gsapountzis@gmail.com> |
st/dri: minor cosmetic for screen - put extensions above init_screen - split out destroy_option_cache
ri_screen.c
|
d7f78065acb09769195a58303ce3e9a401bf7a43 |
25-Mar-2010 |
George Sapountzis <gsapountzis@gmail.com> |
st/dri: add inline for dri2 check done in multiple places
ri_screen.c
ri_screen.h
ri_st_api.c
|
372011bc892481e61c273a12d9601fd6008751ea |
25-Mar-2010 |
Jakob Bornecrantz <wallbraker@gmail.com> |
st/dri: Fix for X server 1.6.0 (DRI2 version 1)
ri_st_api.c
|
fe5f070ef94219f12196bff6cb3274756ea03660 |
19-Mar-2010 |
George Sapountzis <gsapountzis@gmail.com> |
st/dri: fix bug in make_current
ri_context.c
|
92827cd4511fabcaeb8abfdd11122e04502d5944 |
19-Mar-2010 |
George Sapountzis <gsapountzis@gmail.com> |
st/dri: fix bug in allocate_textures
ri1.c
|
bd1ce874728c06d08a1f9881f51edbdd2f1c9db0 |
08-Mar-2010 |
Chia-I Wu <olv@lunarg.com> |
st/dri: Switch from st_public.h to st_api.h. This is tested with demos found in progs/demos. However, only the DRI2 path is tested.
ri1.c
ri1.h
ri_context.c
ri_context.h
ri_drawable.c
ri_drawable.h
ri_extensions.c
ri_screen.c
ri_screen.h
ri_st_api.c
|
5ff21634f3074122ed8b8e4019c8092e31be0335 |
08-Mar-2010 |
Chia-I Wu <olv@lunarg.com> |
st/dri: Implement st_api.h callbacks. This commit adds dri_st_api.c that implements st_api.h callbacks. A following commit will switch st/dri from st_public.h to st_api.h.
akefile
Conscript
ri_drawable.h
ri_st_api.c
ri_st_api.h
|
903b90926c7aebb7f48f3c0fdbe90cd22dd5b662 |
16-Mar-2010 |
Chia-I Wu <olv@lunarg.com> |
st/dri: Headers and public symbols clean up. Remove unused headers and stop marking driDriverAPI as PUBLIC.
ri1.c
ri1.h
ri_context.c
ri_drawable.c
ri_screen.c
|
61631a89a3268925c89934c77ed7c2482eaa1fd1 |
16-Mar-2010 |
Chia-I Wu <olv@lunarg.com> |
st/dri: Move DRI1 bits in dri_context.c to dri1.c.
ri1.c
ri_context.c
ri_context.h
|
a437bc50f2f8ff6e91fdf4dc9758b35cff35645a |
16-Mar-2010 |
Chia-I Wu <olv@lunarg.com> |
st/dri: Move DRI1 bits in dri_drawable.c to dri1.c.
ri1.c
ri1.h
ri_drawable.c
ri_drawable.h
ri_screen.c
|
ca69249f25e0cb89dbfc3d98b92e7386a3029efa |
16-Mar-2010 |
Chia-I Wu <olv@lunarg.com> |
st/dri: Move DRI1 bits in dri_screen.c to dri1.c.
akefile
Conscript
ri1.c
ri1.h
ri_context.c
ri_drawable.c
ri_drawable.h
ri_screen.c
ri_screen.h
|
9d3a873f425fde83628b547c4b4638f39d78c1b9 |
16-Mar-2010 |
Chia-I Wu <olv@lunarg.com> |
Merge remote branch 'origin/gallium-st-api'
|
8e848d682e74f9ae3e105635fe55d19ed8c94547 |
15-Mar-2010 |
Dave Airlie <airlied@redhat.com> |
gallium: fix frontbuffer rendering with r300g No idea if this is the correct fix, but it makes it work again at least. Signed-off-by: Dave Airlie <airlied@redhat.com>
ri_context.c
|
b13e305ee1a2454265fd957a99640a2e49507bea |
12-Mar-2010 |
Michel Dänzer <daenzer@vmware.com> |
Merge branch '7.8'
|
51a51899d0e7eab93468f51296c196b2f3978332 |
12-Mar-2010 |
Michel Dänzer <daenzer@vmware.com> |
st/dri: Always try to set up R5G6B5 configs. Allows compiz to work in depth 16. The DRI2 getBuffersWithFormat hook is only required for 16/32 bit depth buffers, for colour buffers the only requirement is that the format matches the drawable depth, which we can't check here. (cherry picked from commit c50477c255a34444720fb944c54373462ef39fb9)
ri_screen.c
|
de8a879f5c77dbf5c31251e07b2f1b8d2635716c |
07-Feb-2010 |
Chia-I Wu <olv@lunarg.com> |
st/mesa: Implement st_api.h. There is currently no user of this new interface. As the inteface can coexist with st_public.h, everthing should work as before. ST_TEXTURE_2D is both defined by st_public.h and st_api.h. Reorder the headers in st/dri to avoid conflicts.
ri_context.c
ri_drawable.c
|
ed1c69710c5046a80a86a9e8b51a1cb15b1b92eb |
11-Mar-2010 |
Roland Scheidegger <sroland@vmware.com> |
st/mesa: don't enable extensions which aren't actually supported don't enable APPLE_client_storage, TDFX_texture_compression_FXT1, EXT_cull_vertex, NV_vertex_program, NV_vertex_program1_1 - the latter two might work somewhat with some luck. Also don't enable ARB_imaging.
ri_extensions.c
|
a0ae2ca033ec2024da1e01d1c11c0437837c031b |
06-Mar-2010 |
Marek Olšák <maraeo@gmail.com> |
st/dri: move extension initilization to st/mesa completely Extensions were enabled in both st/mesa and st/dri, with st/dri completely overriding the decisions of st/mesa and exposing even the extensions claimed to be unsupported by a pipe driver. This commit moves the differences between the two to st/mesa and removes the responsibilty of advertising extensions from st/dri.
ri_extensions.c
|
3e38dbe3d3371f0a37dd35582301ae2b1507e5d2 |
10-Mar-2010 |
Keith Whitwell <keithw@vmware.com> |
gallium: plumb winsys-drawable-handle through to state tracker The state trackers need this value so that they can supply it as the "void *" argument to flush_frontbuffer. Fixes single-buffer rendering.
ri_context.c
|
3ca933623cf0fd3b025ab7d1b37d3fd01c854807 |
08-Mar-2010 |
Keith Whitwell <keithw@vmware.com> |
Merge commit 'origin/gallium-winsys-handle-rebased'
|
c456dd5b4be15b1fe842e03dd40da4505e79e3fa |
01-Mar-2010 |
José Fonseca <jfonseca@vmware.com> |
dri: Rename pipe formats.
ri_drawable.c
ri_screen.c
|
b2e94d05c9602e2814a513a51eed67d014b338f3 |
15-Feb-2010 |
Jakob Bornecrantz <jakob@vmware.com> |
gallium: Expose a opaque winsys handle and functions on pipe_screen Instead of having these functions on a side interface like on drm_api create a opaque winsys_handle that is to be passed down into the winsys. Currently the only thing ported to this new interface is drm_api, and of that only the components that builds by default is ported. All the drivers and any extra state trackers needs to be ported before this can go into master.
ri_drawable.c
|
307071fe1e2bfacba9780e2397785495ae0b0ea1 |
27-Feb-2010 |
Vinson Lee <vlee@vmware.com> |
st/dri: Assert pointer is not null before dereferencing.
ri_drawable.c
|
196214bf2b677a83653d49f79d03752f29df44ec |
18-Feb-2010 |
Francisco Jerez <currojerez@riseup.net> |
Revert "st/mesa: Make the frontbuffer visible on st_flush(PIPE_FLUSH_FRAME)." We probably don't want to propagate this condition to the pipe driver, this reverts commit f455ca6490fcb65781b21f81c7117bd923e250d1 and the dri_update_buffer flush altogether until an agreement is reached.
ri_drawable.c
|
52e3f0949d47c846e3508a135afd75c439f2c49d |
16-Feb-2010 |
Francisco Jerez <currojerez@riseup.net> |
st/dri2: Flush FRAME instead of RENDER_CACHE on buffer invalidation.
ri_drawable.c
|
f845e4ff1bf4e7e2f804024157494a12eedec174 |
08-Feb-2010 |
Francisco Jerez <currojerez@riseup.net> |
st/dri2: Use event-driven buffer validation.
ri_context.c
ri_drawable.c
ri_screen.c
|
fd40b9ff32ac0ed02928a2b5516c8d678431806f |
11-Feb-2010 |
Zack Rusin <zackr@vmware.com> |
st/dri: don't expose visuals we'll have trouble supporting without getBuffersWithFormat some visuals will just cause headaches (crashes), so if we're running on an older system simply don't advertise them.
ri_screen.c
|
59b4146a5dbeb108b53fc9c4132095e264ba04be |
11-Feb-2010 |
Zack Rusin <zackr@vmware.com> |
st/dri, st/xorg: fix buffers that have attachements of different depth we actually need to specify the formats for different attachements, otherwise if the color buffer is 24bpp and the app asks for 16bpp depth buffer than we end up fetching the depth from the drawable which is 24bpp and end up creating the wrong depth buffer. use the new getBuffersWithFormat extension to pass the depth correctly.
ri_drawable.c
|
3cce4a1e10361458630511543b7a8a6438544775 |
08-Feb-2010 |
Ian Romanick <ian.d.romanick@intel.com> |
dri: Allow selective generation of accum. buffer configs Modify the interface to driCreateConfigs allowing drivers to not expose configs with an accumuation buffer. All of the drivers calling function have been updated to pass true for the accumulation selector. This maintains the current behavior. Signed-off-by: Ian Romanick <ian.d.romanick@intel.com> Reviewed-by: Kristian Høgsberg <krh@bitplanet.net> Reviewed-by: Corbin Simpson <MostAwesomeDude@gmail.com>
ri_screen.c
|
debf00e5fc3828f63e0f99d72c7fa6cd6ce012c5 |
09-Feb-2010 |
Kristian Høgsberg <krh@bitplanet.net> |
dri_interface: Introduce DRI tokens for the texBuffer texture formats This used to take GLX tokens, but the DRI interface can't depend on GLX defines. We fix this by introducing DRI tokens that have the same value as the GLX texture format tokens.
ri_drawable.c
|
361d73fcfc7b5129018e3639279d8dfc6f5f7650 |
08-Feb-2010 |
Keith Whitwell <keithw@vmware.com> |
st/dri: fix compile breakage
ri_context.c
|
7f41f5447c8f9113c8956901e1c5fff6081ecd94 |
08-Feb-2010 |
Keith Whitwell <keithw@vmware.com> |
gallium: squash-merge of gallium screen context Squashed commit of the following: commit 009598122adf5cad42bf9af067eccaf8e89e1233 Author: Christoph Bumiller <e0425955@student.tuwien.ac.at> Date: Mon Feb 8 11:03:26 2010 +0000 nouveau: fix gallium-screen-context branch fallout commit 7b2ffc2019d72e833afea7eebf3e80121187375d Merge: 51e190e c036d13 Author: Keith Whitwell <keithw@vmware.com> Date: Fri Feb 5 09:55:02 2010 +0000 Merge commit 'origin/master' into gallium-screen-context Conflicts: src/gallium/winsys/drm/nouveau/drm/nouveau_drm_api.c This branch has got a pretty tortured history now, I expect a squash merge will be appropriate when it is done. commit 51e190e95acf120f72768fafb29e9721e358df1b Author: Keith Whitwell <keithw@vmware.com> Date: Thu Feb 4 17:58:02 2010 +0000 gallium: fix some build issues commit f524bdaa723fb181637ad30c6ad708aeedabe25b Merge: f906212 3aba0a2 Author: Keith Whitwell <keithw@vmware.com> Date: Thu Feb 4 17:51:32 2010 +0000 Merge commit 'origin/master' into gallium-screen-context commit f9062126883199eabf045714c717cd35f4b7b313 Author: Keith Whitwell <keithw@vmware.com> Date: Thu Feb 4 17:17:12 2010 +0000 gallium/docs: small description of screen::create_context commit efcb37bd3d5ed37f06c6105bd2d750b374ec0927 Author: Keith Whitwell <keithw@vmware.com> Date: Thu Feb 4 16:42:42 2010 +0000 drm/radeon: more dead create_context wrapper removal commit 6badc0dd9e06cf2ec936940bcf12b9ef5324b301 Author: Keith Whitwell <keithw@vmware.com> Date: Thu Feb 4 16:42:30 2010 +0000 drm/i965: more dead create_context wrapper removal commit cf04ebd5a54b18b2d894cfdab2b0f2fd55626ffc Author: Keith Whitwell <keithw@vmware.com> Date: Thu Feb 4 16:42:05 2010 +0000 st/python: more dead create_context wrapper removal commit 444f114c3516abf71c430e6e9d0d2ae3b80679d3 Author: Keith Whitwell <keithw@vmware.com> Date: Thu Feb 4 16:37:58 2010 +0000 idenity: wrapped context creation commit 5a6d09cb9e468d1ee6c8d54b887618819d8d94f2 Author: Keith Whitwell <keithw@vmware.com> Date: Thu Feb 4 16:28:47 2010 +0000 ws/gdi: remove dead context_create wrapper commit 132b55f4bec39386ac625f09aaa11f609664024c Author: Keith Whitwell <keithw@vmware.com> Date: Thu Feb 4 16:27:52 2010 +0000 ws/gdi: remove dead context_create wrapper commit 56d2d21a0cdcb197a364049d354c2f15a4fc026a Author: Keith Whitwell <keithw@vmware.com> Date: Thu Feb 4 16:25:38 2010 +0000 st/xorg: use screen::context_create commit 838c5cfe56b2af6c644909bed3c5e7cdd64c336a Author: Keith Whitwell <keithw@vmware.com> Date: Thu Feb 4 16:23:20 2010 +0000 glx/xlib: simplify creation of trace-wrapped contexts Trace screen knows how to properly wrap context creation in the wrapped screen, so nothing special to do here. commit c99404c03ebaec4175f08a2f363e43c9085f2635 Author: Keith Whitwell <keithw@vmware.com> Date: Thu Feb 4 16:18:24 2010 +0000 st/python: no need to special case context creation for trace commit 193a527a682b6877bb1faecd8092df4dfd055a18 Author: Keith Whitwell <keithw@vmware.com> Date: Thu Feb 4 16:15:30 2010 +0000 drm/radeon: remove dead create_context declaration commit bb984eecc25cf23bc77e1c818b81165ba1a07c9a Author: Keith Whitwell <keithw@vmware.com> Date: Thu Feb 4 16:14:58 2010 +0000 nv/drm: remove dead create_context ref commit e809313a44287dc4e16c28e9e74ef3b2b5271aa1 Author: Keith Whitwell <keithw@vmware.com> Date: Thu Feb 4 16:12:51 2010 +0000 st/egl: remove a layer of wrappers around screen::create_context commit 39caa6672a04122f185c22e17aab86d1c40938bf Author: Keith Whitwell <keithw@vmware.com> Date: Thu Feb 4 16:05:28 2010 +0000 r300g: fill in screen::context_create commit 407f12556d16ba0656774d8a1d9ebda22f82f473 Author: Keith Whitwell <keithw@vmware.com> Date: Thu Feb 4 16:04:04 2010 +0000 cell: adapt for screen::create_context, untested commit d02b0c6ce321a04c76fdabb09e0e4380ce1c1376 Author: Keith Whitwell <keithw@vmware.com> Date: Thu Feb 4 15:50:24 2010 +0000 drm/nv: adapt for screen::create_context All contexts now created directly through the screen, so remove equivalent code here. Remove apparently un-needed array of contexts in the winsys. commit 53eec5b1349aa1b6892a75a7bff7e7530957aeae Author: Keith Whitwell <keithw@vmware.com> Date: Thu Feb 4 15:50:08 2010 +0000 stw: adapt for screen::create_context, untested commit c6a64de3eb381bc9a88e9fbdecbf87d77925aaf5 Author: Keith Whitwell <keithw@vmware.com> Date: Thu Feb 4 15:49:20 2010 +0000 trace: expose the wrapped context's priv data If we are going to keep this priv idea, really want an accessor function for it so that trace and other drivers can wrap that. commit 75d6104e11d86ec2b0749627ed58e35f856ee6eb Author: Keith Whitwell <keithw@vmware.com> Date: Thu Feb 4 15:47:55 2010 +0000 nv30: adapt to screen::context_create commit 12f5deb6ed9723e9b5d34577052b8365813ca14e Author: Keith Whitwell <keithw@vmware.com> Date: Thu Feb 4 15:44:47 2010 +0000 nv40: adapt to screen::context_create commit 14baccaa3b6bbb3b91056126f6521828e786dc62 Author: Keith Whitwell <keithw@vmware.com> Date: Thu Feb 4 15:35:27 2010 +0000 nv50: adapt to screen::create_context Not build tested. Need to figure out how to build nouveau. commit a0e94505ccd2d7f3e604465a2ac302f1286b73b6 Author: Keith Whitwell <keithw@vmware.com> Date: Thu Feb 4 15:22:27 2010 +0000 llvmpipe: update for screen::create_context, untested commit 0eae17107c950346030e4f7e0ec232f868d3893d Author: Keith Whitwell <keithw@vmware.com> Date: Thu Feb 4 15:16:57 2010 +0000 xlib/llvmpipe: remove dead winsys context creation path commit 2f69f9ffaa7e2a01d2483277246ed13051ae4ca3 Author: Keith Whitwell <keithw@vmware.com> Date: Thu Feb 4 14:58:27 2010 +0000 gallium: convert most code to use screen::create_context I wish I could build all of gallium at once to find breakages. commit d7b57f4061b82322cbcae176125913d9f0dea6c1 Author: Keith Whitwell <keithw@vmware.com> Date: Thu Feb 4 12:46:21 2010 +0000 glx: permit building with older protocol headers I'd like to be able to build mesa on current distro releases without having to upgrade from the standard dri2proto and glproto headers. With this change I'm able to build on ancient releases such as Ubuntu 9-10... In general, it would be nice to be able to build-test mesa to check for unintended breakages without having to follow the external dependencies of every group working on the codebase. commit 57adedd6fb06c98572ed8d4aef19203df4c4eea2 Merge: da71847 e1906ae Author: Keith Whitwell <keithw@vmware.com> Date: Thu Feb 4 11:38:15 2010 +0000 Merge commit 'origin/master' into gallium-screen-context Conflicts: src/gallium/drivers/softpipe/sp_video_context.h src/gallium/drivers/trace/tr_context.c src/gallium/state_trackers/wgl/shared/stw_context.c src/gallium/winsys/gdi/gdi_softpipe_winsys.c commit da71847ea6414d7e352c6094f8963bb4eda344dc Author: José Fonseca <jfonseca@vmware.com> Date: Sat May 2 08:57:39 2009 +0100 wgl: Use pipe_screen::context_create. commit 2595a188f93fd903600ef5d8517737ee0592035d Author: José Fonseca <jfonseca@vmware.com> Date: Sat May 2 08:56:47 2009 +0100 trace: Implement pipe_screen::context_create. commit f3640e4ae37a5260cbfba999d079f827de0a313a Author: José Fonseca <jfonseca@vmware.com> Date: Sat May 2 08:56:17 2009 +0100 softpipe: Implement pipe_screen::context_create. commit 347266bddc8bd39c711bacb2193793759d0f3696 Author: José Fonseca <jfonseca@vmware.com> Date: Sat May 2 08:55:31 2009 +0100 gallium: New pipe_screen::context_create callback.
ri_context.c
|
3584a44270a7f3a04e187bd79b5373314514d383 |
04-Feb-2010 |
Dave Airlie <airlied@redhat.com> |
gallium: fix more missing includes from various places nouveau/ dri st / vmware
ri_drawable.c
ri_screen.c
|
12f66b6dc900b8435416eda8ef82905afce4a91e |
01-Feb-2010 |
Vinson Lee <vlee@vmware.com> |
st/dri: Remove duplicate type qualifier.
ri_screen.c
|
9b346f83a7b672e913a7bb6a089d5dbd7fbdce06 |
28-Jan-2010 |
Roland Scheidegger <sroland@vmware.com> |
Merge commit 'origin/perrtblend' Conflicts: src/gallium/drivers/softpipe/sp_screen.c src/gallium/include/pipe/p_defines.h
|
4030cd5a2d2cea6e0eab602ce6fdd9a558db6275 |
28-Jan-2010 |
Vinson Lee <vlee@vmware.com> |
st/dri: Remove unnecessary headers.
ri_drawable.c
ri_screen.c
|
5fae36147e1067ac8b1eb5bcade2f9b1dbf29aa4 |
25-Jan-2010 |
Roland Scheidegger <sroland@vmware.com> |
st/mesa: handle EXT_draw_buffers2 per rendertarget blend enables / colormasks uses the new gallium per-rt blend functionality
ri_extensions.c
|
cd8614b0287dc5a69725ec4ee0208fad61f7789e |
22-Jan-2010 |
Brian Paul <brianp@vmware.com> |
Merge branch 'mesa_7_7_branch' Conflicts: src/gallium/auxiliary/draw/draw_context.c src/gallium/auxiliary/draw/draw_pt_fetch_shade_pipeline.c src/gallium/auxiliary/pipebuffer/Makefile src/gallium/auxiliary/pipebuffer/SConscript src/gallium/auxiliary/pipebuffer/pb_buffer_fenced.c src/gallium/auxiliary/tgsi/tgsi_scan.c src/gallium/drivers/i915/i915_surface.c src/gallium/drivers/i915/i915_texture.c src/gallium/drivers/llvmpipe/lp_setup.c src/gallium/drivers/llvmpipe/lp_tex_sample_c.c src/gallium/drivers/llvmpipe/lp_texture.c src/gallium/drivers/softpipe/sp_prim_vbuf.c src/gallium/state_trackers/xorg/xorg_dri2.c src/gallium/winsys/drm/intel/gem/intel_drm_api.c src/gallium/winsys/drm/nouveau/drm/nouveau_drm_api.c src/gallium/winsys/drm/radeon/core/radeon_drm.c src/gallium/winsys/drm/vmware/core/vmw_screen_dri.c src/mesa/state_tracker/st_cb_clear.c
|
116a02be2264807dafb5fdfd4e3c913bb728c11f |
11-Jan-2010 |
Ben Skeggs <bskeggs@redhat.com> |
st/dri: update dri2 drawables when viewport is changed Fixes gnome-shell on nouveau, as well as window resize with various other applications. Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
ri_drawable.c
ri_drawable.h
ri_screen.c
|
f8db32acbd03079d4ef30daa1db1339aa35b5cfb |
19-Jan-2010 |
Vinson Lee <vlee@vmware.com> |
st/dri: Add comment for intentional fallthrough in case statement.
ri_drawable.c
|
e978b24c87be6d7572ed3272e6b186d5c54fb414 |
18-Jan-2010 |
Marcin Slusarz <marcin.slusarz@gmail.com> |
st/dri: fix optionCache memory leaks Signed-off-by: Brian Paul <brianp@vmware.com>
ri_context.c
ri_screen.c
|
a16d353b5ea0e14887a2cd2db222beb357b37d65 |
18-Jan-2010 |
Corbin Simpson <MostAwesomeDude@gmail.com> |
dri: Add an MSAA-enabled factor to DRI configs. 4 samples should be enough for GLUT to be satisfied, and I think most of the HW that does any MSAA, can do it. Note that any pipe that doesn't multisample can just ignore the corresponding flag in pipe_rasterizer_state.
ri_screen.c
|
c273ab007dc4194b62965c3b1d9c8a90ea573680 |
18-Jan-2010 |
Corbin Simpson <MostAwesomeDude@gmail.com> |
dri: Properly calculate number of modes for MSAA. Split from the next patch for bisection purposes only.
ri_screen.c
|
5f2d60a7154f896bb418231662663465269ce9b8 |
18-Jan-2010 |
Thomas Hellstrom <thellstrom@vmware.com> |
st/dri: Don't request a fake front if the server adds one automatically. We use the presence of the getBuffersWithFormat extension function to detect whether the server automatically adds a front. Signed-off-by: Thomas Hellstrom <thellstrom@vmware.com>
ri_drawable.c
ri_screen.c
ri_screen.h
|
b01ffb12ed82dcf435b186e2aff35e344a8a6ebe |
14-Jan-2010 |
Jakob Bornecrantz <jakob@vmware.com> |
Merge branch 'mesa_7_7_branch' Conflicts: src/gallium/auxiliary/pipebuffer/pb_buffer_fenced.c src/gallium/auxiliary/util/Makefile src/gallium/drivers/r300/r300_state_derived.c
|
a9086f2d17a58bd2597d34a6cc886dc111997e4e |
13-Jan-2010 |
Thomas Hellstrom <thellstrom@vmware.com> |
st/dri: Make sure we always request a fake front. This should be the correct, but sub-optimal way to handle things on pre-1.7 servers. For servers that automatically adds a fake front we should never request the fake front and handle the reply differently. Signed-off-by: Thomas Hellstrom <thellstrom@vmware.com>
ri_drawable.c
|
32da02f7c19f49802fe9589e73c3945502a197c9 |
11-Jan-2010 |
Ben Skeggs <bskeggs@redhat.com> |
st/dri: update dri2 drawables when viewport is changed Fixes gnome-shell on nouveau, as well as window resize with various other applications. Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
ri_drawable.c
ri_drawable.h
ri_screen.c
|
cb51f0267853dad419d169587aecbecf1800e8c3 |
11-Jan-2010 |
Thomas Hellstrom <thellstrom@vmware.com> |
Revert "st/dri: no need to request fake front buffer, only handle it being returned" This reverts commit 1336989ec60fff7bd590fefd28945a0e5dc536e3. The commit breaks frontbuffer rendering and the possibility to do on-demand frontbuffer requests on all Xservers prior to 1.7. The commit should be conditioned on a dri2 version check. I've submitted a patch to Xserver to bump dri2 minor, and it's acked by Ian. To be able to check the version from within the state tracker, we will probably need another dri2 extension function that returns the server version. The protocol has support for it. Signed-off-by: Thomas Hellstrom <thellstrom@vmware.com>
ri_drawable.c
|
39a0e4e7de379a182c1544fa24d5cb2a7687ec72 |
01-Jan-2010 |
Kristian Høgsberg <krh@bitplanet.net> |
Push __driDriverExtensions out of dri_util.c and into the drivers This lets the individual drivers select which extensions to advertise. Specifically, most drivers (tdfx, sis, savage etc) don't support DRI2 but the shared extension list in dri_util.c does list the DRI2 extension. Pushing the list into the drivers, lets us avoid listing the DRI2 extension for drivers that don't support it.
ri_screen.c
|
d61f07318c8678901b948fdaa8ccdf37aa3203e9 |
01-Jan-2010 |
Kristian Høgsberg <krh@bitplanet.net> |
Remove leftover __DRI{screen,drawable,context}Private references As part of the DRI driver interface rewrite I merged __DRIscreenPrivate and __DRIscreen, and likewise for __DRIdrawablePrivate and __DRIcontextPrivate. I left typedefs in place though, to avoid renaming all the *Private use internal to the driver. That was probably a mistake, and it turns out a one-line find+sed combo can do the mass rename. Better late than never.
ri_context.c
ri_context.h
ri_drawable.c
ri_drawable.h
ri_screen.c
ri_screen.h
|
16c6dce013f089d072256652f012b3b604781bfd |
17-Dec-2009 |
Michal Krol <michal@vmware.com> |
Merge branch 'master' into pipe-format-simplify Conflicts: src/gallium/auxiliary/draw/draw_pipe_aaline.c src/gallium/auxiliary/draw/draw_pipe_pstipple.c src/gallium/auxiliary/util/u_blit.c src/gallium/auxiliary/util/u_gen_mipmap.c src/gallium/auxiliary/util/u_surface.c src/gallium/auxiliary/vl/vl_mpeg12_mc_renderer.c src/gallium/drivers/cell/ppu/cell_texture.c src/gallium/drivers/llvmpipe/lp_texture.c src/gallium/drivers/r300/r300_emit.c src/gallium/drivers/r300/r300_texture.c src/gallium/drivers/softpipe/sp_texture.c src/gallium/drivers/softpipe/sp_tile_cache.c src/gallium/drivers/svga/svga_state_vs.c src/gallium/include/pipe/p_format.h src/gallium/state_trackers/dri/dri_drawable.c src/gallium/state_trackers/egl/egl_surface.c src/gallium/state_trackers/python/p_device.i src/gallium/state_trackers/python/st_softpipe_winsys.c src/gallium/state_trackers/vega/api_filters.c src/gallium/state_trackers/vega/image.c src/gallium/state_trackers/vega/mask.c src/gallium/state_trackers/vega/paint.c src/gallium/state_trackers/vega/renderer.c src/gallium/state_trackers/vega/vg_tracker.c src/gallium/state_trackers/xorg/xorg_crtc.c src/gallium/state_trackers/xorg/xorg_dri2.c src/gallium/state_trackers/xorg/xorg_exa.c src/gallium/state_trackers/xorg/xorg_renderer.c src/gallium/state_trackers/xorg/xorg_xv.c src/gallium/state_trackers/xorg/xvmc/surface.c src/gallium/winsys/drm/nouveau/drm/nouveau_drm_api.c src/gallium/winsys/drm/radeon/core/radeon_buffer.c src/gallium/winsys/egl_xlib/sw_winsys.c src/gallium/winsys/g3dvl/xlib/xsp_winsys.c src/gallium/winsys/gdi/gdi_llvmpipe_winsys.c src/gallium/winsys/gdi/gdi_softpipe_winsys.c src/gallium/winsys/xlib/xlib_cell.c src/gallium/winsys/xlib/xlib_llvmpipe.c src/gallium/winsys/xlib/xlib_softpipe.c src/mesa/state_tracker/st_cb_fbo.c src/mesa/state_tracker/st_cb_texture.c src/mesa/state_tracker/st_texture.c
|
6df42d80234d13676fc3207cf44f0e371e3372b5 |
03-Dec-2009 |
Michal Krol <michal@vmware.com> |
Move pf_get_block() to u_format auxiliary module.
ri_drawable.c
|
decf6ed810eae473d043a4a399a5a84f1378a725 |
30-Nov-2009 |
Roland Scheidegger <sroland@vmware.com> |
fixups for interface changes (mostly state trackers)
ri_drawable.c
|
d509f84543d0979e9bb53c20c195f378dd61e728 |
26-Nov-2009 |
Roland Scheidegger <sroland@vmware.com> |
gallium: fix more statetrackers/drivers for not using texture width/height/depth arrays
ri_drawable.c
|
d030ce6a843f3a374356edfbe8e04924277197db |
11-Nov-2009 |
Corbin Simpson <MostAwesomeDude@gmail.com> |
dri-st: Add some required GL 2.0 extensions. Two-sided stencil and NPOT textures.
ri_extensions.c
|
17ef1f6074d6107c167f1956a5c60993904c0b72 |
08-Oct-2009 |
Chia-I Wu <olvaffe@gmail.com> |
mesa: Enable remap table in core. This enables the remap table in core. driInitExtensions is adapted to use the remap table. All uses of extension_helper.h are replaced by remap_helper.h. The chicken-egg problem of the DRI drivers is also solved. It is now also possible to pass NULL extensions to driInitExtensions. It will cause driInitExtensions to map all known functions. This functionality is used by software drivers and EGL_i915. Signed-off-by: Chia-I Wu <olvaffe@gmail.com>
ri_extensions.c
ri_screen.c
|
973aab1a528f0a42e8b5e979b4730649ea366363 |
19-Oct-2009 |
Corbin Simpson <MostAwesomeDude@gmail.com> |
dri-st: Add EXT_provoking_vertex. Hm, I could have sworn I did this before?
ri_extensions.c
|
bb567357bc1366df7115e0daa68c2470e3bf6ba6 |
18-Oct-2009 |
Corbin Simpson <MostAwesomeDude@gmail.com> |
gallium: Permit surface_copy and surface_fill to be NULL. Uf. Lots of files touched. Would people with working vega, xorg, dri1, etc. please make sure you are not broken, and fix yourself up if you are. There were only two or three places where the code did not have painful fallbacks, so I would advise st maintainers to find less painful workarounds, or consider overhauling util_surface_copy and util_surface_fill. Per ymanton, darktama, and Dr_Jakob's suggestions, clear has been left as-is. I will not add PIPE_CAP_BLITTER unless it is deemed necessary.
ri_drawable.c
|
de81b2cf0a465e2c6c43c7f9f864129728b3a080 |
07-Oct-2009 |
Michel Dänzer <daenzer@vmware.com> |
st/dri: Add missing front buffer case in dri_get_buffers(). This seems to help for compiz at least with some drivers. Also add an assert(0) to catch unhandled cases in the future.
ri_drawable.c
|
d47de5054091a5d1fa9b19687ac80bcdc39a5f8f |
05-Oct-2009 |
Ben Skeggs <bskeggs@redhat.com> |
st/dri: avoid segfault if we can't get a pixmap's buffers Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
ri_drawable.c
|
1336989ec60fff7bd590fefd28945a0e5dc536e3 |
05-Oct-2009 |
Ben Skeggs <bskeggs@redhat.com> |
st/dri: no need to request fake front buffer, only handle it being returned The previous behaviour was incorrect, and resulted in EXT_tfp being broken for DDX drivers that implement the correct behaviour (intel/radeon/nouveau). In the cases where a fake front buffer is required, the X server will return one when requesting __DRI_BUFFER_FRONT_LEFT. The Xorg state tracker (aka modesetting_drv) is likely broken now until it's modified to match the other drivers. Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
ri_drawable.c
|
fce2095a90440d1c129583fb8b6c26a93d4bde13 |
03-Oct-2009 |
Nicolai Hähnle <nhaehnle@gmail.com> |
st/dri: Install APPLE_vertex_array_object functions Besides from being necessary to use that extension, it also fixes a crash when deleting the currently bound vertex array object. Signed-off-by: Nicolai Hähnle <nhaehnle@gmail.com>
ri_extensions.c
|
ebbd65eb0658adcb797e0788a3472a7b69b3bfc2 |
03-Oct-2009 |
Nicolai Hähnle <nhaehnle@gmail.com> |
st/dri: Install ARB_vertex_array_object functions Signed-off-by: Nicolai Hähnle <nhaehnle@gmail.com>
ri_extensions.c
|
0b26d97f4d48e5f7e5a4230a411e3a1d91928bb4 |
02-Sep-2009 |
Michel Dänzer <daenzer@vmware.com> |
st/dri: Slight consolidation of DRI2 buffer handling. Always use / assume a combined depth/stencil buffer. Also update drawable formats from surfaces returned by the driver.
ri_drawable.c
ri_drawable.h
|
1e5014f7dfabcaf1f4b5608eb08e97179446eb09 |
27-Aug-2009 |
Jakob Bornecrantz <jakob@vmware.com> |
drm_api: Operate on textures instead of buffers Most use cases just got the buffer from the texture and then called into one of the get_handle functions. Also with this patch it would be easier to move to a generic function for getting handles from textures and textures from handles, that is exposed via the screen.
ri_drawable.c
|
b26aee0ffed3f3baee9d65365812e40598a26138 |
27-Aug-2009 |
Jakob Bornecrantz <jakob@vmware.com> |
st/dri: Fix some warnings
ri_context.c
ri_drawable.c
ri_drawable.h
|
205d344e2a2f0c9ea982b037ab68feab06cbebb1 |
28-Aug-2009 |
Jakob Bornecrantz <jakob@vmware.com> |
Revert "st/xorg/dri: Pass texture formats via the DRI2 protocol flags." This reverts commit a33e9ea3b9b7ac98d6e9bc385bbbe7eac2eb73d0. As this change breaks both radeon and nouveau
ri_drawable.c
|
bfbfcdd7036add7121eb728daad6131fd77304d0 |
27-Aug-2009 |
Michel Dänzer <daenzer@vmware.com> |
st/dri: Make sure the front left renderbuffer is there for texture-from-pixmap.
ri_drawable.c
|
f3a540f6d7fce1465c16647b209e14694a5291df |
27-Aug-2009 |
Michel Dänzer <daenzer@vmware.com> |
st/dri: Only ask for fake front buffer for single buffer visuals by default.
ri_drawable.c
|
a33e9ea3b9b7ac98d6e9bc385bbbe7eac2eb73d0 |
27-Aug-2009 |
Michel Dänzer <daenzer@vmware.com> |
st/xorg/dri: Pass texture formats via the DRI2 protocol flags. No need to guess.
ri_drawable.c
|
53b3cdaee2654895dc90a25376ba29b64d166c54 |
26-Aug-2009 |
Jakob Bornecrantz <jakob@vmware.com> |
st/dri: Add some debug code
ri_drawable.c
|
aab0bedb8c791531256b9cf4ef165080ccc75e9b |
26-Aug-2009 |
Jakob Bornecrantz <jakob@vmware.com> |
st/dri: Redo config generation
ri_drawable.c
ri_screen.c
|
1664bc1a37ab85c5d1b14d90c4674201c9154382 |
26-Aug-2009 |
Ben Skeggs <bskeggs@redhat.com> |
st/dri: make the GL_ARB_map_buffer_range entrypoints available
ri_extensions.c
|
54fb71b863c6a4d4cda61c69d842f7ee91d062f9 |
22-Aug-2009 |
Jakob Bornecrantz <jakob@vmware.com> |
st/dri: Remove some debug prints
ri_drawable.c
|
a3e59b9d06bcad6b1ab741ee659a4db0d119d5ef |
22-Aug-2009 |
Jakob Bornecrantz <jakob@vmware.com> |
st/dri: Find out if the drawable is a pixmap Part of this code is disabled since no performance gains where detected with it enabled. This code only detects if it is a pixmap that it is rendering to on the st/xorg DDX since it sets the fake front to the same handle as front.
ri_drawable.c
ri_drawable.h
|
6237ac2412b08a3b6239203be69ce542335ae47e |
22-Aug-2009 |
Jakob Bornecrantz <jakob@vmware.com> |
st/dri: Fix frontbuffer rendering with DRI2
ri_drawable.c
|
9616e4ad1c055d8ff9ab671914f97e402d0aa4b0 |
14-Aug-2009 |
Keith Whitwell <keithw@vmware.com> |
st/dri: remove unused dummyContext value
ri_context.c
ri_screen.h
|
ace98f09e6e77bba33dd1789506676059bba8e9b |
13-Aug-2009 |
Michel Dänzer <daenzer@vmware.com> |
st/dri: Add support for GLX_EXT_texture_from_pixmap with direct rendering.
ri_drawable.c
ri_drawable.h
ri_screen.c
|
b727150b1473d8cac7a8e6ad0b5112c486d93341 |
14-Jul-2009 |
Corbin Simpson <MostAwesomeDude@gmail.com> |
dri-st: Unbreak GL_EXT_blend_equation_separate. Since it has a dispatch table entry (for BlendEquationSeparateEXT,) can't omit it from this list. It'll still get disabled if the cap (PIPE_CAP_BLEND_EQUATION_SEPARATE) isn't set. Somebody that doesn't suck at GL (read: not me) should probably add this into progs/samples/blendeq or similar so we can test it.
ri_extensions.c
|
54cf63278ff28eb03503f649c46bf24437a1cbf8 |
14-Jul-2009 |
Patrice Mandin <patmandin@gmail.com> |
gallium: Define PIPE_CAP_BLEND_EQUATION_SEPARATE, remove extension from default extension list
ri_extensions.c
|
303cbb45b558a2b94e6922252cf57d115ba60b82 |
30-Jun-2009 |
Jakob Bornecrantz <jakob@vmware.com> |
drm/st: Return drm_api struct from a function
ri_context.c
ri_drawable.c
ri_screen.c
ri_screen.h
|
1ac72aedb24c56c7158f770f4297516b3bf1899d |
27-Jun-2009 |
Jakob Bornecrantz <jakob@vmware.com> |
st/dri: Fix last depth bits logic
ri_screen.c
|
5d0a1d4241ccfe40fcf593edf1f5bac970db35c0 |
22-Jun-2009 |
Jakob Bornecrantz <jakob@vmware.com> |
st/dri: Fix typo when checking for depth formats
ri_screen.c
|
0342229289c3bd5ed7bc595db4fc88003430209e |
17-Jun-2009 |
Thomas Hellstrom <thellstrom@vmware.com> |
gallium dri st: Probe the driver for supported surface formats. This is done when constructing the fbconfigs, and the result is saved for window system framebuffer creation. Note: For dri2 the server needs to have an identical format selection logic. Otherwise the dri state-tracker and the xorg driver (state-tracker) will disagree on which format to use for the attachments. Some more work is needed in this area. Signed-off-by: Thomas Hellstrom <thellstrom@vmware.com>
ri_drawable.c
ri_drawable.h
ri_screen.c
ri_screen.h
|
0d2ac7a10b2904eda70794534a9a73b3f4b654cf |
11-Jun-2009 |
Thomas Hellstrom <thellstrom-at-vmware-dot-com> |
dri st: Don't require the PIPE_TEXTURE_USAGE_RENDER_TARGET property for depth- and stencil renderbuffers. Signed-off-by: Thomas Hellstrom <thellstrom-at-vmware-dot-com>
ri_drawable.c
|
7d11a392d780ef7f0374f8da87e3ba416d880cf2 |
18-May-2009 |
Jakob Bornecrantz <jakob@vmware.com> |
st/dri: Only create new textures if drawable has changed
ri_drawable.c
ri_drawable.h
|
0036f2ccba6720e06a578333f04086d100d188b1 |
18-May-2009 |
Corbin Simpson <MostAwesomeDude@gmail.com> |
dri-gallium: Add GLSL support. Oh, look, it's more features. :3
ri_extensions.c
|
ba27fe3710af4933a16278a3e97162bef1737b56 |
30-Apr-2009 |
Michel Dänzer <daenzer@vmware.com> |
gallium: Add SCons build support for the DRI state tracker.
Conscript
|
2c994ad3cb91288966bdc028b0afa9935a51a971 |
28-Apr-2009 |
Thomas Hellstrom <thellstrom-at-vmware-dot-com> |
gallium dri st: Propagate the drawable info when we bind to new drawables. Signed-off-by: Thomas Hellstrom <thellstrom-at-vmware-dot-com>
ri_context.c
|
8cfa6546c9aa25edad3e7bc3cf6f1a9399052b79 |
28-Apr-2009 |
Thomas Hellstrom <thellstrom-at-vmware-dot-com> |
gallium dri st: Use st_get_current() instead of GET_CURRENT_CONTEXT() Signed-off-by: Thomas Hellstrom <thellstrom-at-vmware-dot-com>
ri_context.c
ri_drawable.c
|
171c7f91cd3dcb41bf7abb333d725b3b3a3e9b1a |
28-Apr-2009 |
Thomas Hellstrom <thellstrom-at-vmware-dot-com> |
gallium dri st: Fix up some comments and minor bugs. Signed-off-by: Thomas Hellstrom <thellstrom-at-vmware-dot-com>
ri_context.c
ri_drawable.c
|
05af5a7f593ac6451cff9e6923d4a969d5358bcb |
28-Apr-2009 |
Thomas Hellstrom <thellstrom-at-vmware-dot-com> |
gallium: Rename the dri state tracker lib to libdridrm.a
akefile
|
0929b2bf3cdb54d94da8dee5797878e2ee582b41 |
28-Apr-2009 |
Thomas Hellstrom <thellstrom-at-vmware-dot-com> |
gallium: indent and cleanfile the dri state-tracker.
ri_context.c
ri_context.h
ri_drawable.c
ri_drawable.h
ri_extensions.c
ri_screen.c
ri_screen.h
|
ca1f5f7e6c05e34cfe8ef10f29aa19f5547311e6 |
28-Apr-2009 |
Thomas Hellstrom <thellstrom-at-vmware-dot-com> |
gallium: Update the dri2 state tracker to support dri1. Signed-off-by: Thomas Hellstrom <thellstrom-at-vmware-dot-com>
ri_context.c
ri_context.h
ri_drawable.c
ri_drawable.h
ri_screen.c
ri_screen.h
|
2e5acd24b0421f3824fbe441f4a7062c1f081109 |
28-Apr-2009 |
Thomas Hellstrom <thellstrom-at-vmware-dot-com> |
gallium: Move the dri2 state tracker since we're about to extend it to dri1. Signed-off-by: Thomas Hellstrom <thellstrom-at-vmware-dot-com>
akefile
ri_context.c
ri_context.h
ri_drawable.c
ri_drawable.h
ri_extensions.c
ri_screen.c
ri_screen.h
|