projects
/
mesa.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
3873ffe
)
st/drm: s/hocks/hooks/
author
Jakob Bornecrantz
<wallbraker@gmail.com>
Tue, 3 Mar 2009 20:56:10 +0000
(21:56 +0100)
committer
Jakob Bornecrantz
<wallbraker@gmail.com>
Tue, 3 Mar 2009 21:18:14 +0000
(22:18 +0100)
12 files changed:
src/gallium/include/state_tracker/drm_api.h
patch
|
blob
|
history
src/gallium/state_trackers/dri2/dri_context.c
patch
|
blob
|
history
src/gallium/state_trackers/dri2/dri_drawable.c
patch
|
blob
|
history
src/gallium/state_trackers/dri2/dri_screen.c
patch
|
blob
|
history
src/gallium/state_trackers/egl/egl_context.c
patch
|
blob
|
history
src/gallium/state_trackers/egl/egl_surface.c
patch
|
blob
|
history
src/gallium/state_trackers/egl/egl_tracker.c
patch
|
blob
|
history
src/gallium/state_trackers/xorg/xorg_crtc.c
patch
|
blob
|
history
src/gallium/state_trackers/xorg/xorg_dri2.c
patch
|
blob
|
history
src/gallium/state_trackers/xorg/xorg_driver.c
patch
|
blob
|
history
src/gallium/state_trackers/xorg/xorg_exa.c
patch
|
blob
|
history
src/gallium/winsys/drm/intel/gem/intel_be_api.c
patch
|
blob
|
history
diff --git
a/src/gallium/include/state_tracker/drm_api.h
b/src/gallium/include/state_tracker/drm_api.h
index 91a727be66fbc880716aa427e341a015b809b8b2..435435da29ccbfb0bbe710aa8e1572ce66cf82de 100644
(file)
--- a/
src/gallium/include/state_tracker/drm_api.h
+++ b/
src/gallium/include/state_tracker/drm_api.h
@@
-42,6
+42,6
@@
struct drm_api
/**
* A driver needs to export this symbol
*/
/**
* A driver needs to export this symbol
*/
-extern struct drm_api drm_api_ho
c
ks;
+extern struct drm_api drm_api_ho
o
ks;
#endif
#endif
diff --git
a/src/gallium/state_trackers/dri2/dri_context.c
b/src/gallium/state_trackers/dri2/dri_context.c
index a8a94be176ce1768c64b56b5a37a538c7afde93e..b8e92a76c02c0877eaa71824c5e986da18251c34 100644
(file)
--- a/
src/gallium/state_trackers/dri2/dri_context.c
+++ b/
src/gallium/state_trackers/dri2/dri_context.c
@@
-71,7
+71,7
@@
dri_create_context(const __GLcontextModes *visual,
sPriv->myNum,
"dri");
sPriv->myNum,
"dri");
- ctx->pipe = drm_api_ho
c
ks.create_context(screen->pipe_screen);
+ ctx->pipe = drm_api_ho
o
ks.create_context(screen->pipe_screen);
if (ctx->pipe == NULL)
goto fail;
if (ctx->pipe == NULL)
goto fail;
diff --git
a/src/gallium/state_trackers/dri2/dri_drawable.c
b/src/gallium/state_trackers/dri2/dri_drawable.c
index 120d45bc036140fcbcc9485f2824de768e4ee97f..97778473b19ea5da1225c411ec5e3cf4afd07049 100644
(file)
--- a/
src/gallium/state_trackers/dri2/dri_drawable.c
+++ b/
src/gallium/state_trackers/dri2/dri_drawable.c
@@
-57,7
+57,7
@@
dri_surface_from_handle(struct pipe_screen *screen,
struct pipe_texture templat;
struct pipe_buffer *buf = NULL;
struct pipe_texture templat;
struct pipe_buffer *buf = NULL;
- buf = drm_api_ho
c
ks.buffer_from_handle(screen, "dri2 buffer", handle);
+ buf = drm_api_ho
o
ks.buffer_from_handle(screen, "dri2 buffer", handle);
if (!buf)
return NULL;
if (!buf)
return NULL;
diff --git
a/src/gallium/state_trackers/dri2/dri_screen.c
b/src/gallium/state_trackers/dri2/dri_screen.c
index 1fef5382946bbee7ec45a838343fb4418095b8c3..ac3aee5015278d8573004f7bc2d7d1bf0281548f 100644
(file)
--- a/
src/gallium/state_trackers/dri2/dri_screen.c
+++ b/
src/gallium/state_trackers/dri2/dri_screen.c
@@
-208,7
+208,7
@@
dri_init_screen2(__DRIscreenPrivate *sPriv)
sPriv->extensions = dri_screen_extensions;
sPriv->extensions = dri_screen_extensions;
- screen->pipe_screen = drm_api_ho
c
ks.create_screen(screen->fd, screen->deviceID);
+ screen->pipe_screen = drm_api_ho
o
ks.create_screen(screen->fd, screen->deviceID);
if (!screen->pipe_screen) {
debug_printf("%s: failed to create pipe_screen\n", __FUNCTION__);
goto fail;
if (!screen->pipe_screen) {
debug_printf("%s: failed to create pipe_screen\n", __FUNCTION__);
goto fail;
diff --git
a/src/gallium/state_trackers/egl/egl_context.c
b/src/gallium/state_trackers/egl/egl_context.c
index 8564972b91e2c0e015e4db5258ed79437bcaf6c0..36548fae26327e002e62a37f85a01e6bb39468c2 100644
(file)
--- a/
src/gallium/state_trackers/egl/egl_context.c
+++ b/
src/gallium/state_trackers/egl/egl_context.c
@@
-115,7
+115,7
@@
drm_create_context(_EGLDriver *drv, EGLDisplay dpy, EGLConfig config, EGLContext
_eglInitContext(drv, dpy, &ctx->base, config, attrib_list);
_eglInitContext(drv, dpy, &ctx->base, config, attrib_list);
- ctx->pipe = drm_api_ho
c
ks.create_context(dev->screen);
+ ctx->pipe = drm_api_ho
o
ks.create_context(dev->screen);
if (!ctx->pipe)
goto err_pipe;
if (!ctx->pipe)
goto err_pipe;
diff --git
a/src/gallium/state_trackers/egl/egl_surface.c
b/src/gallium/state_trackers/egl/egl_surface.c
index aa3c32d41c9f9253747af0fed82ea4a62bdddd6c..7ebc34871c776bfccaca76c8d376abce89430e3c 100644
(file)
--- a/
src/gallium/state_trackers/egl/egl_surface.c
+++ b/
src/gallium/state_trackers/egl/egl_surface.c
@@
-132,7
+132,7
@@
drm_create_texture(_EGLDriver *drv,
scrn->front.width = w;
scrn->front.height = h;
scrn->front.pitch = pitch;
scrn->front.width = w;
scrn->front.height = h;
scrn->front.pitch = pitch;
- drm_api_ho
cks.handle_from_buffer(dev->winsys
, scrn->buffer, &scrn->front.handle);
+ drm_api_ho
oks.handle_from_buffer(screen
, scrn->buffer, &scrn->front.handle);
if (0)
goto err_handle;
if (0)
goto err_handle;
@@
-271,7
+271,6
@@
drm_show_screen_surface_mesa(_EGLDriver *drv, EGLDisplay dpy,
struct drm_device *dev = (struct drm_device *)drv;
struct drm_surface *surf = lookup_drm_surface(surface);
struct drm_screen *scrn = lookup_drm_screen(dpy, screen);
struct drm_device *dev = (struct drm_device *)drv;
struct drm_surface *surf = lookup_drm_surface(surface);
struct drm_screen *scrn = lookup_drm_screen(dpy, screen);
- struct pipe_context *pipe;
_EGLMode *mode = _eglLookupMode(dpy, m);
int ret;
unsigned int i, k;
_EGLMode *mode = _eglLookupMode(dpy, m);
int ret;
unsigned int i, k;
diff --git
a/src/gallium/state_trackers/egl/egl_tracker.c
b/src/gallium/state_trackers/egl/egl_tracker.c
index 2813bf43609a282e1ccad7a16103f1df881e7ca1..a22ef381b966a3a6ea7084d897deed7857b05b83 100644
(file)
--- a/
src/gallium/state_trackers/egl/egl_tracker.c
+++ b/
src/gallium/state_trackers/egl/egl_tracker.c
@@
-121,7
+121,7
@@
drm_initialize(_EGLDriver *drv, EGLDisplay dpy, EGLint *major, EGLint *minor)
dev->drmFD = fd;
drm_get_device_id(dev);
dev->drmFD = fd;
drm_get_device_id(dev);
- dev->screen = drm_api_ho
c
ks.create_screen(dev->drmFD, dev->deviceID);
+ dev->screen = drm_api_ho
o
ks.create_screen(dev->drmFD, dev->deviceID);
if (!dev->screen)
goto err_screen;
dev->winsys = dev->screen->winsys;
if (!dev->screen)
goto err_screen;
dev->winsys = dev->screen->winsys;
diff --git
a/src/gallium/state_trackers/xorg/xorg_crtc.c
b/src/gallium/state_trackers/xorg/xorg_crtc.c
index 0765f56ee151dba99aebd2260991547d214bb1ac..0bd69c214fe8296008006a3c0d443096d9978f95 100644
(file)
--- a/
src/gallium/state_trackers/xorg/xorg_crtc.c
+++ b/
src/gallium/state_trackers/xorg/xorg_crtc.c
@@
-194,7
+194,7
@@
crtc_load_cursor_argb(xf86CrtcPtr crtc, CARD32 * image)
PIPE_BUFFER_USAGE_CPU_WRITE |
PIPE_BUFFER_USAGE_GPU_READ,
64*64*4);
PIPE_BUFFER_USAGE_CPU_WRITE |
PIPE_BUFFER_USAGE_GPU_READ,
64*64*4);
- drm_api_ho
c
ks.handle_from_buffer(ms->screen,
+ drm_api_ho
o
ks.handle_from_buffer(ms->screen,
crtcp->cursor_buf,
&crtcp->cursor_handle);
}
crtcp->cursor_buf,
&crtcp->cursor_handle);
}
diff --git
a/src/gallium/state_trackers/xorg/xorg_dri2.c
b/src/gallium/state_trackers/xorg/xorg_dri2.c
index 72b333eaf1824a1425b3aa5f830b4a89027f5ed6..d48b7dd27bd1f6659f68581ff8647340c7fd1670 100644
(file)
--- a/
src/gallium/state_trackers/xorg/xorg_dri2.c
+++ b/
src/gallium/state_trackers/xorg/xorg_dri2.c
@@
-109,8
+109,8
@@
driCreateBuffers(DrawablePtr pDraw, unsigned int *attachments, int count)
tex = ms->screen->texture_create(ms->screen, &template);
}
tex = ms->screen->texture_create(ms->screen, &template);
}
- drm_api_ho
c
ks.buffer_from_texture(tex, &buf, &stride);
- drm_api_ho
c
ks.global_handle_from_buffer(ms->screen, buf, &handle);
+ drm_api_ho
o
ks.buffer_from_texture(tex, &buf, &stride);
+ drm_api_ho
o
ks.global_handle_from_buffer(ms->screen, buf, &handle);
buffers[i].name = handle;
buffers[i].attachment = attachments[i];
buffers[i].name = handle;
buffers[i].attachment = attachments[i];
diff --git
a/src/gallium/state_trackers/xorg/xorg_driver.c
b/src/gallium/state_trackers/xorg/xorg_driver.c
index d166a365ac5c634e6223eb4cba1e1ec714362530..8a2711e70cd7b1bddb0867f33f34579cd6ad945e 100644
(file)
--- a/
src/gallium/state_trackers/xorg/xorg_driver.c
+++ b/
src/gallium/state_trackers/xorg/xorg_driver.c
@@
-476,7
+476,7
@@
ScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv)
}
if (!ms->screen) {
}
if (!ms->screen) {
- ms->screen = drm_api_ho
c
ks.create_screen(ms->fd, ms->PciInfo->device_id);
+ ms->screen = drm_api_ho
o
ks.create_screen(ms->fd, ms->PciInfo->device_id);
if (!ms->screen) {
FatalError("Could not init pipe_screen\n");
if (!ms->screen) {
FatalError("Could not init pipe_screen\n");
diff --git
a/src/gallium/state_trackers/xorg/xorg_exa.c
b/src/gallium/state_trackers/xorg/xorg_exa.c
index ac0bfc88a4dbade2ee27ea19f662069567526dba..c62625c4481294a361cc3525f51660934e72e852 100644
(file)
--- a/
src/gallium/state_trackers/xorg/xorg_exa.c
+++ b/
src/gallium/state_trackers/xorg/xorg_exa.c
@@
-380,8
+380,8
@@
xorg_exa_get_pixmap_handle(PixmapPtr pPixmap)
return 0;
}
return 0;
}
- drm_api_ho
c
ks.buffer_from_texture(priv->tex, &buffer, &stride);
- drm_api_ho
c
ks.handle_from_buffer(ms->screen, buffer, &handle);
+ drm_api_ho
o
ks.buffer_from_texture(priv->tex, &buffer, &stride);
+ drm_api_ho
o
ks.handle_from_buffer(ms->screen, buffer, &handle);
pipe_buffer_reference(ms->screen, &buffer, NULL);
return handle;
}
pipe_buffer_reference(ms->screen, &buffer, NULL);
return handle;
}
@@
-519,7
+519,7
@@
xorg_exa_init(ScrnInfoPtr pScrn)
}
exa->scrn = ms->screen;
}
exa->scrn = ms->screen;
- exa->ctx = drm_api_ho
c
ks.create_context(exa->scrn);
+ exa->ctx = drm_api_ho
o
ks.create_context(exa->scrn);
/* Share context with DRI */
ms->ctx = exa->ctx;
/* Share context with DRI */
ms->ctx = exa->ctx;
diff --git
a/src/gallium/winsys/drm/intel/gem/intel_be_api.c
b/src/gallium/winsys/drm/intel/gem/intel_be_api.c
index 3f71c25441495ca3b210a20ebcdd2a0b3152977e..f4ef7c2d88b480bfee41871d778fcde1ad67c42d 100644
(file)
--- a/
src/gallium/winsys/drm/intel/gem/intel_be_api.c
+++ b/
src/gallium/winsys/drm/intel/gem/intel_be_api.c
@@
-2,7
+2,7
@@
#include "intel_be_api.h"
#include "i915simple/i915_winsys.h"
#include "intel_be_api.h"
#include "i915simple/i915_winsys.h"
-struct drm_api drm_api_ho
c
ks =
+struct drm_api drm_api_ho
o
ks =
{
/* intel_be_context.c */
.create_context = intel_be_create_context,
{
/* intel_be_context.c */
.create_context = intel_be_create_context,