andreacavalli/xserver-multidpi
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge remote-tracking branch 'anholt/glamor-pull-request'

Browse Source
This commit is contained in:
Keith Packard 2014-02-24 09:40:23 -08:00
commit 0840a303c4
26 changed files with 1507 additions and 2055 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
configure.ac
View File

@ -2069,7 +2069,7 @@ dnl glamor
AM_CONDITIONAL([GLAMOR], [test "x$GLAMOR" = xyes]) AM_CONDITIONAL([GLAMOR], [test "x$GLAMOR" = xyes])
if test "x$GLAMOR" = xyes; then if test "x$GLAMOR" = xyes; then
AC_DEFINE(GLAMOR, 1, [Build glamor]) AC_DEFINE(GLAMOR, 1, [Build glamor])
PKG_CHECK_MODULES([GLAMOR], [egl gl]) PKG_CHECK_MODULES([GLAMOR], [epoxy])
fi fi
dnl XWin DDX dnl XWin DDX

5
glamor/Makefile.am
View File

@ -6,15 +6,15 @@ AM_CFLAGS = $(CWARNFLAGS) $(DIX_CFLAGS) $(GLAMOR_CFLAGS)
libglamor_la_SOURCES = \ libglamor_la_SOURCES = \
glamor.c \ glamor.c \
glamor_context.h \
glamor_copyarea.c \ glamor_copyarea.c \
glamor_copywindow.c \ glamor_copywindow.c \
glamor_core.c \ glamor_core.c \
glamor_debug.h \ glamor_debug.h \
glamor_gl_dispatch.h \
glamor_fill.c \ glamor_fill.c \
glamor_fillspans.c \ glamor_fillspans.c \
glamor_getspans.c \ glamor_getspans.c \
glamor_glext.h \ glamor_glx.c \
glamor_glyphs.c \ glamor_glyphs.c \
glamor_polyfillrect.c \ glamor_polyfillrect.c \
glamor_polylines.c \ glamor_polylines.c \
@ -35,7 +35,6 @@ libglamor_la_SOURCES = \
glamor_largepixmap.c\ glamor_largepixmap.c\
glamor_picture.c\ glamor_picture.c\
glamor_window.c\ glamor_window.c\
glamor_gl_dispatch.c\
glamor_fbo.c\ glamor_fbo.c\
glamor_compositerects.c\ glamor_compositerects.c\
glamor_xv.c\ glamor_xv.c\

74
glamor/glamor.c
View File

@ -95,7 +95,7 @@ glamor_set_pixmap_texture(PixmapPtr pixmap, unsigned int tex)
glamor_destroy_fbo(fbo); glamor_destroy_fbo(fbo);
} }
gl_iformat_for_depth(pixmap->drawable.depth, &format); format = gl_iformat_for_pixmap(pixmap);
fbo = glamor_create_fbo_from_tex(glamor_priv, pixmap->drawable.width, fbo = glamor_create_fbo_from_tex(glamor_priv, pixmap->drawable.width,
pixmap->drawable.height, format, tex, 0); pixmap->drawable.height, format, tex, 0);
@ -162,7 +162,7 @@ glamor_create_pixmap(ScreenPtr screen, int w, int h, int depth,
pixmap_priv->base.pixmap = pixmap; pixmap_priv->base.pixmap = pixmap;
pixmap_priv->base.glamor_priv = glamor_priv; pixmap_priv->base.glamor_priv = glamor_priv;
gl_iformat_for_depth(depth, &format); format = gl_iformat_for_pixmap(pixmap);
pitch = (((w * pixmap->drawable.bitsPerPixel + 7) / 8) + 3) & ~3; pitch = (((w * pixmap->drawable.bitsPerPixel + 7) / 8) + 3) & ~3;
screen->ModifyPixmapHeader(pixmap, w, h, 0, 0, pitch, NULL); screen->ModifyPixmapHeader(pixmap, w, h, 0, 0, pitch, NULL);
@ -218,13 +218,12 @@ void
glamor_block_handler(ScreenPtr screen) glamor_block_handler(ScreenPtr screen)
{ {
glamor_screen_private *glamor_priv = glamor_get_screen_private(screen); glamor_screen_private *glamor_priv = glamor_get_screen_private(screen);
glamor_gl_dispatch *dispatch;
dispatch = glamor_get_dispatch(glamor_priv); glamor_get_context(glamor_priv);
glamor_priv->tick++; glamor_priv->tick++;
dispatch->glFlush(); glFlush();
glamor_fbo_expire(glamor_priv); glamor_fbo_expire(glamor_priv);
glamor_put_dispatch(glamor_priv); glamor_put_context(glamor_priv);
if (glamor_priv->state == RENDER_STATE if (glamor_priv->state == RENDER_STATE
&& glamor_priv->render_idle_cnt++ > RENDER_IDEL_MAX) { && glamor_priv->render_idle_cnt++ > RENDER_IDEL_MAX) {
glamor_priv->state = IDLE_STATE; glamor_priv->state = IDLE_STATE;
@ -236,10 +235,10 @@ static void
_glamor_block_handler(void *data, OSTimePtr timeout, void *last_select_mask) _glamor_block_handler(void *data, OSTimePtr timeout, void *last_select_mask)
{ {
glamor_screen_private *glamor_priv = data; glamor_screen_private *glamor_priv = data;
glamor_gl_dispatch *dispatch = glamor_get_dispatch(glamor_priv);
dispatch->glFlush(); glamor_get_context(glamor_priv);
glamor_put_dispatch(glamor_priv); glFlush();
glamor_put_context(glamor_priv);
} }
static void static void
@ -281,10 +280,10 @@ glamor_init(ScreenPtr screen, unsigned int flags)
return FALSE; return FALSE;
if (flags & GLAMOR_INVERTED_Y_AXIS) { if (flags & GLAMOR_INVERTED_Y_AXIS) {
glamor_priv->yInverted = 1; glamor_priv->yInverted = TRUE;
} }
else else
glamor_priv->yInverted = 0; glamor_priv->yInverted = FALSE;
if (!dixRegisterPrivateKey(glamor_screen_private_key, PRIVATE_SCREEN, 0)) { if (!dixRegisterPrivateKey(glamor_screen_private_key, PRIVATE_SCREEN, 0)) {
LogMessage(X_WARNING, LogMessage(X_WARNING,
@ -302,50 +301,49 @@ glamor_init(ScreenPtr screen, unsigned int flags)
goto fail;; goto fail;;
} }
if (epoxy_is_desktop_gl())
glamor_priv->gl_flavor = GLAMOR_GL_DESKTOP;
else
glamor_priv->gl_flavor = GLAMOR_GL_ES2;
gl_version = glamor_gl_get_version(); gl_version = glamor_gl_get_version();
#ifndef GLAMOR_GLES2 if (glamor_priv->gl_flavor == GLAMOR_GL_DESKTOP) {
if (gl_version < GLAMOR_GL_VERSION_ENCODE(1, 3)) { if (gl_version < GLAMOR_GL_VERSION_ENCODE(1, 3)) {
ErrorF("Require OpenGL version 1.3 or latter.\n"); ErrorF("Require OpenGL version 1.3 or later.\n");
goto fail; goto fail;
} }
#else } else {
if (gl_version < GLAMOR_GL_VERSION_ENCODE(2, 0)) { if (gl_version < GLAMOR_GL_VERSION_ENCODE(2, 0)) {
ErrorF("Require Open GLES2.0 or latter.\n"); ErrorF("Require Open GLES2.0 or later.\n");
goto fail; goto fail;
} }
#endif
glamor_gl_dispatch_init(screen, &glamor_priv->_dispatch, gl_version); if (!glamor_gl_has_extension("GL_EXT_texture_format_BGRA8888")) {
ErrorF("GL_EXT_texture_format_BGRA8888 required\n");
#ifdef GLAMOR_GLES2 goto fail;
if (!glamor_gl_has_extension("GL_EXT_texture_format_BGRA8888")) { }
ErrorF("GL_EXT_texture_format_BGRA8888 required\n");
goto fail;
} }
#endif
glamor_priv->has_pack_invert = glamor_priv->has_pack_invert =
glamor_gl_has_extension("GL_MESA_pack_invert"); glamor_gl_has_extension("GL_MESA_pack_invert");
glamor_priv->has_fbo_blit = glamor_priv->has_fbo_blit =
glamor_gl_has_extension("GL_EXT_framebuffer_blit"); glamor_gl_has_extension("GL_EXT_framebuffer_blit");
glamor_priv->_dispatch.glGetIntegerv(GL_MAX_RENDERBUFFER_SIZE, glGetIntegerv(GL_MAX_RENDERBUFFER_SIZE, &glamor_priv->max_fbo_size);
&glamor_priv->max_fbo_size);
#ifdef MAX_FBO_SIZE #ifdef MAX_FBO_SIZE
glamor_priv->max_fbo_size = MAX_FBO_SIZE; glamor_priv->max_fbo_size = MAX_FBO_SIZE;
#endif #endif
glamor_set_debug_level(&glamor_debug_level); glamor_set_debug_level(&glamor_debug_level);
#ifdef GLAMOR_GLES2
glamor_priv->gl_flavor = GLAMOR_GL_ES2;
#else
glamor_priv->gl_flavor = GLAMOR_GL_DESKTOP;
#endif
/* If we are using egl screen, call egl screen init to /* If we are using egl screen, call egl screen init to
* register correct close screen function. */ * register correct close screen function. */
if (flags & GLAMOR_USE_EGL_SCREEN) if (flags & GLAMOR_USE_EGL_SCREEN) {
glamor_egl_screen_init(screen); glamor_egl_screen_init(screen, &glamor_priv->ctx);
} else {
if (!glamor_glx_screen_init(&glamor_priv->ctx))
goto fail;
}
glamor_priv->saved_procs.close_screen = screen->CloseScreen; glamor_priv->saved_procs.close_screen = screen->CloseScreen;
screen->CloseScreen = glamor_close_screen; screen->CloseScreen = glamor_close_screen;

7
glamor/glamor.h
View File

@ -36,6 +36,8 @@
#include <fb.h> #include <fb.h>
#include <fbpict.h> #include <fbpict.h>
struct glamor_context;
/* /*
* glamor_pixmap_type : glamor pixmap's type. * glamor_pixmap_type : glamor pixmap's type.
* @MEMORY: pixmap is in memory. * @MEMORY: pixmap is in memory.
@ -142,11 +144,6 @@ extern _X_EXPORT void glamor_block_handler(ScreenPtr screen);
extern _X_EXPORT PixmapPtr glamor_create_pixmap(ScreenPtr screen, int w, int h, extern _X_EXPORT PixmapPtr glamor_create_pixmap(ScreenPtr screen, int w, int h,
int depth, unsigned int usage); int depth, unsigned int usage);
extern _X_EXPORT void glamor_egl_screen_init(ScreenPtr screen);
extern _X_EXPORT void glamor_egl_make_current(ScreenPtr screen);
extern _X_EXPORT void glamor_egl_restore_context(ScreenPtr screen);
/* @glamor_egl_exchange_buffers: Exchange the underlying buffers(KHR image,fbo). /* @glamor_egl_exchange_buffers: Exchange the underlying buffers(KHR image,fbo).
* *
* @front: front pixmap. * @front: front pixmap.

56
glamor/glamor_context.h Normal file
View File

@ -0,0 +1,56 @@
/*
* Copyright © 2013 Intel Corporation
*
* Permission is hereby granted, free of charge, to any person obtaining a
* copy of this software and associated documentation files (the "Software"),
* to deal in the Software without restriction, including without limitation
* the rights to use, copy, modify, merge, publish, distribute, sublicense,
* and/or sell copies of the Software, and to permit persons to whom the
* Software is furnished to do so, subject to the following conditions:
*
* The above copyright notice and this permission notice (including the next
* paragraph) shall be included in all copies or substantial portions of the
* Software.
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
* THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
* FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
* IN THE SOFTWARE.
*/
/**
* @file glamor_context.h
*
* This is the struct of state required for context switching in
* glamor. It has to use types that don't require including either
* server headers or Xlib headers, since it will be included by both
* the server and the GLX (xlib) code.
*/
struct glamor_context {
/** Either an EGLDisplay or an Xlib Display */
void *display;
/** Either a GLXContext or an EGLContext. */
void *ctx;
/** The EGLSurface we should MakeCurrent to */
void *drawable;
/** The GLXDrawable we should MakeCurrent to */
uint32_t drawable_xid;
/**
* Count of how deep in glamor_get_context() we are, to reduce
* MakeCurrent calls.
*/
int get_count;
void (*get_context)(struct glamor_context *glamor_ctx);
void (*put_context)(struct glamor_context *glamor_ctx);
};
Bool glamor_glx_screen_init(struct glamor_context *glamor_ctx);

136
glamor/glamor_copyarea.c
View File

@ -31,7 +31,6 @@
* *
* GC CopyArea implementation * GC CopyArea implementation
*/ */
#ifndef GLAMOR_GLES2
static Bool static Bool
glamor_copy_n_to_n_fbo_blit(DrawablePtr src, glamor_copy_n_to_n_fbo_blit(DrawablePtr src,
DrawablePtr dst, DrawablePtr dst,
@ -42,7 +41,6 @@ glamor_copy_n_to_n_fbo_blit(DrawablePtr src,
PixmapPtr src_pixmap = glamor_get_drawable_pixmap(src); PixmapPtr src_pixmap = glamor_get_drawable_pixmap(src);
glamor_pixmap_private *src_pixmap_priv, *dst_pixmap_priv; glamor_pixmap_private *src_pixmap_priv, *dst_pixmap_priv;
glamor_screen_private *glamor_priv = glamor_get_screen_private(screen); glamor_screen_private *glamor_priv = glamor_get_screen_private(screen);
glamor_gl_dispatch *dispatch;
int dst_x_off, dst_y_off, src_x_off, src_y_off, i; int dst_x_off, dst_y_off, src_x_off, src_y_off, i;
int fbo_x_off, fbo_y_off; int fbo_x_off, fbo_y_off;
int src_fbo_x_off, src_fbo_y_off; int src_fbo_x_off, src_fbo_y_off;
@ -72,9 +70,8 @@ glamor_copy_n_to_n_fbo_blit(DrawablePtr src,
pixmap_priv_get_fbo_off(dst_pixmap_priv, &fbo_x_off, &fbo_y_off); pixmap_priv_get_fbo_off(dst_pixmap_priv, &fbo_x_off, &fbo_y_off);
pixmap_priv_get_fbo_off(src_pixmap_priv, &src_fbo_x_off, &src_fbo_y_off); pixmap_priv_get_fbo_off(src_pixmap_priv, &src_fbo_x_off, &src_fbo_y_off);
dispatch = glamor_get_dispatch(glamor_priv); glamor_get_context(glamor_priv);
dispatch->glBindFramebuffer(GL_READ_FRAMEBUFFER_EXT, glBindFramebuffer(GL_READ_FRAMEBUFFER_EXT, src_pixmap_priv->base.fbo->fb);
src_pixmap_priv->base.fbo->fb);
glamor_get_drawable_deltas(dst, dst_pixmap, &dst_x_off, &dst_y_off); glamor_get_drawable_deltas(dst, dst_pixmap, &dst_x_off, &dst_y_off);
glamor_get_drawable_deltas(src, src_pixmap, &src_x_off, &src_y_off); glamor_get_drawable_deltas(src, src_pixmap, &src_x_off, &src_y_off);
dst_x_off += fbo_x_off; dst_x_off += fbo_x_off;
@ -84,23 +81,15 @@ glamor_copy_n_to_n_fbo_blit(DrawablePtr src,
for (i = 0; i < nbox; i++) { for (i = 0; i < nbox; i++) {
if (glamor_priv->yInverted) { if (glamor_priv->yInverted) {
dispatch->glBlitFramebuffer((box[i].x1 + dx + glBlitFramebuffer(box[i].x1 + dx + src_x_off,
src_x_off), box[i].y1 + src_y_off,
(box[i].y1 + box[i].x2 + dx + src_x_off,
src_y_off), box[i].y2 + src_y_off,
(box[i].x2 + dx + box[i].x1 + dst_x_off,
src_x_off), box[i].y1 + dst_y_off,
(box[i].y2 + box[i].x2 + dst_x_off,
src_y_off), box[i].y2 + dst_y_off,
(box[i].x1 + GL_COLOR_BUFFER_BIT, GL_NEAREST);
dst_x_off),
(box[i].y1 +
dst_y_off),
(box[i].x2 +
dst_x_off),
(box[i].y2 +
dst_y_off),
GL_COLOR_BUFFER_BIT, GL_NEAREST);
} }
else { else {
int flip_dst_y1 = int flip_dst_y1 =
@ -112,26 +101,21 @@ glamor_copy_n_to_n_fbo_blit(DrawablePtr src,
int flip_src_y2 = int flip_src_y2 =
src_pixmap->drawable.height - (box[i].y1 + src_y_off); src_pixmap->drawable.height - (box[i].y1 + src_y_off);
dispatch->glBlitFramebuffer(box[i].x1 + dx + glBlitFramebuffer(box[i].x1 + dx + src_x_off,
src_x_off, flip_src_y1,
flip_src_y1, box[i].x2 + dx + src_x_off,
box[i].x2 + dx + flip_src_y2,
src_x_off, box[i].x1 + dst_x_off,
flip_src_y2, flip_dst_y1,
box[i].x1 + box[i].x2 + dst_x_off,
dst_x_off, flip_dst_y2,
flip_dst_y1, GL_COLOR_BUFFER_BIT, GL_NEAREST);
box[i].x2 +
dst_x_off,
flip_dst_y2,
GL_COLOR_BUFFER_BIT, GL_NEAREST);
} }
} }
glamor_put_dispatch(glamor_priv); glamor_put_context(glamor_priv);
glamor_priv->state = BLIT_STATE; glamor_priv->state = BLIT_STATE;
return TRUE; return TRUE;
} }
#endif
static Bool static Bool
glamor_copy_n_to_n_textured(DrawablePtr src, glamor_copy_n_to_n_textured(DrawablePtr src,
@ -140,7 +124,6 @@ glamor_copy_n_to_n_textured(DrawablePtr src,
{ {
glamor_screen_private *glamor_priv = glamor_screen_private *glamor_priv =
glamor_get_screen_private(dst->pScreen); glamor_get_screen_private(dst->pScreen);
glamor_gl_dispatch *dispatch;
PixmapPtr src_pixmap = glamor_get_drawable_pixmap(src); PixmapPtr src_pixmap = glamor_get_drawable_pixmap(src);
PixmapPtr dst_pixmap = glamor_get_drawable_pixmap(dst); PixmapPtr dst_pixmap = glamor_get_drawable_pixmap(dst);
int i; int i;
@ -172,37 +155,32 @@ glamor_copy_n_to_n_textured(DrawablePtr src,
glamor_get_drawable_deltas(dst, dst_pixmap, &dst_x_off, &dst_y_off); glamor_get_drawable_deltas(dst, dst_pixmap, &dst_x_off, &dst_y_off);
dispatch = glamor_get_dispatch(glamor_priv); glamor_get_context(glamor_priv);
glamor_set_destination_pixmap_priv_nc(dst_pixmap_priv); glamor_set_destination_pixmap_priv_nc(dst_pixmap_priv);
dispatch->glVertexAttribPointer(GLAMOR_VERTEX_POS, 2, GL_FLOAT, glVertexAttribPointer(GLAMOR_VERTEX_POS, 2, GL_FLOAT,
GL_FALSE, 2 * sizeof(float), vertices); GL_FALSE, 2 * sizeof(float), vertices);
dispatch->glEnableVertexAttribArray(GLAMOR_VERTEX_POS); glEnableVertexAttribArray(GLAMOR_VERTEX_POS);
glamor_get_drawable_deltas(src, src_pixmap, &src_x_off, &src_y_off); glamor_get_drawable_deltas(src, src_pixmap, &src_x_off, &src_y_off);
dx += src_x_off; dx += src_x_off;
dy += src_y_off; dy += src_y_off;
dispatch->glActiveTexture(GL_TEXTURE0); glActiveTexture(GL_TEXTURE0);
dispatch->glBindTexture(GL_TEXTURE_2D, src_pixmap_priv->base.fbo->tex); glBindTexture(GL_TEXTURE_2D, src_pixmap_priv->base.fbo->tex);
#ifndef GLAMOR_GLES2 if (glamor_priv->gl_flavor == GLAMOR_GL_DESKTOP) {
dispatch->glEnable(GL_TEXTURE_2D); glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_BORDER);
dispatch->glTexParameteri(GL_TEXTURE_2D, glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_BORDER);
GL_TEXTURE_WRAP_S, GL_CLAMP_TO_BORDER); }
dispatch->glTexParameteri(GL_TEXTURE_2D, glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST);
GL_TEXTURE_WRAP_T, GL_CLAMP_TO_BORDER); glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
#endif
dispatch->glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST);
dispatch->glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
dispatch->glVertexAttribPointer(GLAMOR_VERTEX_SOURCE, 2, glVertexAttribPointer(GLAMOR_VERTEX_SOURCE, 2, GL_FLOAT, GL_FALSE,
GL_FLOAT, GL_FALSE, 2 * sizeof(float), texcoords);
2 * sizeof(float), texcoords); glEnableVertexAttribArray(GLAMOR_VERTEX_SOURCE);
dispatch->glEnableVertexAttribArray(GLAMOR_VERTEX_SOURCE); glUseProgram(glamor_priv->finish_access_prog[0]);
dispatch->glUseProgram(glamor_priv->finish_access_prog[0]); glUniform1i(glamor_priv->finish_access_revert[0], REVERT_NONE);
dispatch->glUniform1i(glamor_priv->finish_access_revert[0], REVERT_NONE); glUniform1i(glamor_priv->finish_access_swap_rb[0], SWAP_NONE_UPLOADING);
dispatch->glUniform1i(glamor_priv->finish_access_swap_rb[0],
SWAP_NONE_UPLOADING);
for (i = 0; i < nbox; i++) { for (i = 0; i < nbox; i++) {
@ -222,17 +200,14 @@ glamor_copy_n_to_n_textured(DrawablePtr src,
box[i].x2 + dx, box[i].x2 + dx,
box[i].y2 + dy, box[i].y2 + dy,
glamor_priv->yInverted, texcoords); glamor_priv->yInverted, texcoords);
dispatch->glDrawArrays(GL_TRIANGLE_FAN, 0, 4); glDrawArrays(GL_TRIANGLE_FAN, 0, 4);
} }
dispatch->glDisableVertexAttribArray(GLAMOR_VERTEX_POS); glDisableVertexAttribArray(GLAMOR_VERTEX_POS);
dispatch->glDisableVertexAttribArray(GLAMOR_VERTEX_SOURCE); glDisableVertexAttribArray(GLAMOR_VERTEX_SOURCE);
#ifndef GLAMOR_GLES2 glUseProgram(0);
dispatch->glDisable(GL_TEXTURE_2D);
#endif
dispatch->glUseProgram(0);
/* The source texture is bound to a fbo, we have to flush it here. */ /* The source texture is bound to a fbo, we have to flush it here. */
glamor_put_dispatch(glamor_priv); glamor_put_context(glamor_priv);
glamor_priv->state = RENDER_STATE; glamor_priv->state = RENDER_STATE;
glamor_priv->render_idle_cnt = 0; glamor_priv->render_idle_cnt = 0;
return TRUE; return TRUE;
@ -289,15 +264,14 @@ __glamor_copy_n_to_n(DrawablePtr src,
box[0].x1, box[0].y1, box[0].x1, box[0].y1,
box[0].x2 - box[0].x1, box[0].y2 - box[0].y1, box[0].x2 - box[0].x1, box[0].y2 - box[0].y1,
dx, dy, src_pixmap, dst_pixmap); dx, dy, src_pixmap, dst_pixmap);
#ifndef GLAMOR_GLES2 if (glamor_priv->gl_flavor == GLAMOR_GL_DESKTOP &&
if (!overlaped && !overlaped &&
(glamor_priv->state != RENDER_STATE (glamor_priv->state != RENDER_STATE
|| !src_pixmap_priv->base.gl_tex || !dst_pixmap_priv->base.gl_tex) || !src_pixmap_priv->base.gl_tex || !dst_pixmap_priv->base.gl_tex)
&& glamor_copy_n_to_n_fbo_blit(src, dst, gc, box, nbox, dx, dy)) { && glamor_copy_n_to_n_fbo_blit(src, dst, gc, box, nbox, dx, dy)) {
ret = TRUE; ret = TRUE;
goto done; goto done;
} }
#endif
glamor_calculate_boxes_bound(&bound, box, nbox); glamor_calculate_boxes_bound(&bound, box, nbox);
/* Overlaped indicate the src and dst are the same pixmap. */ /* Overlaped indicate the src and dst are the same pixmap. */
@ -364,10 +338,10 @@ _glamor_copy_n_to_n(DrawablePtr src,
Bool upsidedown, Pixel bitplane, Bool upsidedown, Pixel bitplane,
void *closure, Bool fallback) void *closure, Bool fallback)
{ {
ScreenPtr screen = dst->pScreen;
PixmapPtr dst_pixmap, src_pixmap; PixmapPtr dst_pixmap, src_pixmap;
glamor_pixmap_private *dst_pixmap_priv, *src_pixmap_priv; glamor_pixmap_private *dst_pixmap_priv, *src_pixmap_priv;
glamor_screen_private *glamor_priv; glamor_screen_private *glamor_priv;
glamor_gl_dispatch *dispatch;
BoxPtr extent; BoxPtr extent;
RegionRec region; RegionRec region;
int src_x_off, src_y_off, dst_x_off, dst_y_off; int src_x_off, src_y_off, dst_x_off, dst_y_off;
@ -381,7 +355,7 @@ _glamor_copy_n_to_n(DrawablePtr src,
src_pixmap = glamor_get_drawable_pixmap(src); src_pixmap = glamor_get_drawable_pixmap(src);
src_pixmap_priv = glamor_get_pixmap_private(src_pixmap); src_pixmap_priv = glamor_get_pixmap_private(src_pixmap);
glamor_priv = glamor_get_screen_private(dst->pScreen); glamor_priv = glamor_get_screen_private(screen);
DEBUGF("Copy %d %d %dx%d dx %d dy %d from %p to %p \n", DEBUGF("Copy %d %d %dx%d dx %d dy %d from %p to %p \n",
box[0].x1, box[0].y1, box[0].x1, box[0].y1,
@ -394,12 +368,12 @@ _glamor_copy_n_to_n(DrawablePtr src,
if (gc) { if (gc) {
if (!glamor_set_planemask(dst_pixmap, gc->planemask)) if (!glamor_set_planemask(dst_pixmap, gc->planemask))
goto fall_back; goto fall_back;
dispatch = glamor_get_dispatch(glamor_priv); glamor_get_context(glamor_priv);
if (!glamor_set_alu(dispatch, gc->alu)) { if (!glamor_set_alu(screen, gc->alu)) {
glamor_put_dispatch(glamor_priv); glamor_put_context(glamor_priv);
goto fail; goto fail;
} }
glamor_put_dispatch(glamor_priv); glamor_put_context(glamor_priv);
} }
if (!src_pixmap_priv) { if (!src_pixmap_priv) {
@ -572,9 +546,9 @@ _glamor_copy_n_to_n(DrawablePtr src,
} }
fail: fail:
dispatch = glamor_get_dispatch(glamor_priv); glamor_get_context(glamor_priv);
glamor_set_alu(dispatch, GXcopy); glamor_set_alu(screen, GXcopy);
glamor_put_dispatch(glamor_priv); glamor_put_context(glamor_priv);
if (ok) if (ok)
return TRUE; return TRUE;

130
glamor/glamor_core.c
View File

@ -51,24 +51,23 @@ glamor_get_drawable_location(const DrawablePtr drawable)
} }
GLint GLint
glamor_compile_glsl_prog(glamor_gl_dispatch * dispatch, GLenum type, glamor_compile_glsl_prog(GLenum type, const char *source)
const char *source)
{ {
GLint ok; GLint ok;
GLint prog; GLint prog;
prog = dispatch->glCreateShader(type); prog = glCreateShader(type);
dispatch->glShaderSource(prog, 1, (const GLchar **) &source, NULL); glShaderSource(prog, 1, (const GLchar **) &source, NULL);
dispatch->glCompileShader(prog); glCompileShader(prog);
dispatch->glGetShaderiv(prog, GL_COMPILE_STATUS, &ok); glGetShaderiv(prog, GL_COMPILE_STATUS, &ok);
if (!ok) { if (!ok) {
GLchar *info; GLchar *info;
GLint size; GLint size;
dispatch->glGetShaderiv(prog, GL_INFO_LOG_LENGTH, &size); glGetShaderiv(prog, GL_INFO_LOG_LENGTH, &size);
info = malloc(size); info = malloc(size);
if (info) { if (info) {
dispatch->glGetShaderInfoLog(prog, size, NULL, info); glGetShaderInfoLog(prog, size, NULL, info);
ErrorF("Failed to compile %s: %s\n", ErrorF("Failed to compile %s: %s\n",
type == GL_FRAGMENT_SHADER ? "FS" : "VS", info); type == GL_FRAGMENT_SHADER ? "FS" : "VS", info);
ErrorF("Program source:\n%s", source); ErrorF("Program source:\n%s", source);
@ -83,20 +82,20 @@ glamor_compile_glsl_prog(glamor_gl_dispatch * dispatch, GLenum type,
} }
void void
glamor_link_glsl_prog(glamor_gl_dispatch * dispatch, GLint prog) glamor_link_glsl_prog(GLint prog)
{ {
GLint ok; GLint ok;
dispatch->glLinkProgram(prog); glLinkProgram(prog);
dispatch->glGetProgramiv(prog, GL_LINK_STATUS, &ok); glGetProgramiv(prog, GL_LINK_STATUS, &ok);
if (!ok) { if (!ok) {
GLchar *info; GLchar *info;
GLint size; GLint size;
dispatch->glGetProgramiv(prog, GL_INFO_LOG_LENGTH, &size); glGetProgramiv(prog, GL_INFO_LOG_LENGTH, &size);
info = malloc(size); info = malloc(size);
dispatch->glGetProgramInfoLog(prog, size, NULL, info); glGetProgramInfoLog(prog, size, NULL, info);
ErrorF("Failed to link: %s\n", info); ErrorF("Failed to link: %s\n", info);
FatalError("GLSL link failure\n"); FatalError("GLSL link failure\n");
} }
@ -143,7 +142,6 @@ void
glamor_init_finish_access_shaders(ScreenPtr screen) glamor_init_finish_access_shaders(ScreenPtr screen)
{ {
glamor_screen_private *glamor_priv; glamor_screen_private *glamor_priv;
glamor_gl_dispatch *dispatch;
const char *vs_source = const char *vs_source =
"attribute vec4 v_position;\n" "attribute vec4 v_position;\n"
"attribute vec4 v_texcoord0;\n" "attribute vec4 v_texcoord0;\n"
@ -217,86 +215,78 @@ glamor_init_finish_access_shaders(ScreenPtr screen)
char *source; char *source;
glamor_priv = glamor_get_screen_private(screen); glamor_priv = glamor_get_screen_private(screen);
dispatch = glamor_get_dispatch(glamor_priv); glamor_get_context(glamor_priv);
glamor_priv->finish_access_prog[0] = dispatch->glCreateProgram(); glamor_priv->finish_access_prog[0] = glCreateProgram();
glamor_priv->finish_access_prog[1] = dispatch->glCreateProgram(); glamor_priv->finish_access_prog[1] = glCreateProgram();
vs_prog = glamor_compile_glsl_prog(dispatch, GL_VERTEX_SHADER, vs_source); vs_prog = glamor_compile_glsl_prog(GL_VERTEX_SHADER, vs_source);
XNFasprintf(&source, "%s%s", common_source, fs_source); XNFasprintf(&source, "%s%s", common_source, fs_source);
fs_prog = glamor_compile_glsl_prog(dispatch, GL_FRAGMENT_SHADER, source); fs_prog = glamor_compile_glsl_prog(GL_FRAGMENT_SHADER, source);
free(source); free(source);
dispatch->glAttachShader(glamor_priv->finish_access_prog[0], vs_prog); glAttachShader(glamor_priv->finish_access_prog[0], vs_prog);
dispatch->glAttachShader(glamor_priv->finish_access_prog[0], fs_prog); glAttachShader(glamor_priv->finish_access_prog[0], fs_prog);
avs_prog = glamor_compile_glsl_prog(dispatch, GL_VERTEX_SHADER, vs_source); avs_prog = glamor_compile_glsl_prog(GL_VERTEX_SHADER, vs_source);
XNFasprintf(&source, "%s%s", common_source, set_alpha_source); XNFasprintf(&source, "%s%s", common_source, set_alpha_source);
set_alpha_prog = glamor_compile_glsl_prog(dispatch, GL_FRAGMENT_SHADER, set_alpha_prog = glamor_compile_glsl_prog(GL_FRAGMENT_SHADER,
source); source);
free(source); free(source);
dispatch->glAttachShader(glamor_priv->finish_access_prog[1], avs_prog); glAttachShader(glamor_priv->finish_access_prog[1], avs_prog);
dispatch->glAttachShader(glamor_priv->finish_access_prog[1], glAttachShader(glamor_priv->finish_access_prog[1], set_alpha_prog);
set_alpha_prog);
dispatch->glBindAttribLocation(glamor_priv->finish_access_prog[0], glBindAttribLocation(glamor_priv->finish_access_prog[0],
GLAMOR_VERTEX_POS, "v_position"); GLAMOR_VERTEX_POS, "v_position");
dispatch->glBindAttribLocation(glamor_priv->finish_access_prog[0], glBindAttribLocation(glamor_priv->finish_access_prog[0],
GLAMOR_VERTEX_SOURCE, "v_texcoord0"); GLAMOR_VERTEX_SOURCE, "v_texcoord0");
glamor_link_glsl_prog(dispatch, glamor_priv->finish_access_prog[0]); glamor_link_glsl_prog(glamor_priv->finish_access_prog[0]);
dispatch->glBindAttribLocation(glamor_priv->finish_access_prog[1], glBindAttribLocation(glamor_priv->finish_access_prog[1],
GLAMOR_VERTEX_POS, "v_position"); GLAMOR_VERTEX_POS, "v_position");
dispatch->glBindAttribLocation(glamor_priv->finish_access_prog[1], glBindAttribLocation(glamor_priv->finish_access_prog[1],
GLAMOR_VERTEX_SOURCE, "v_texcoord0"); GLAMOR_VERTEX_SOURCE, "v_texcoord0");
glamor_link_glsl_prog(dispatch, glamor_priv->finish_access_prog[1]); glamor_link_glsl_prog(glamor_priv->finish_access_prog[1]);
glamor_priv->finish_access_revert[0] = glamor_priv->finish_access_revert[0] =
dispatch->glGetUniformLocation(glamor_priv->finish_access_prog[0], glGetUniformLocation(glamor_priv->finish_access_prog[0], "revert");
"revert");
glamor_priv->finish_access_swap_rb[0] = glamor_priv->finish_access_swap_rb[0] =
dispatch->glGetUniformLocation(glamor_priv->finish_access_prog[0], glGetUniformLocation(glamor_priv->finish_access_prog[0], "swap_rb");
"swap_rb");
sampler_uniform_location = sampler_uniform_location =
dispatch->glGetUniformLocation(glamor_priv->finish_access_prog[0], glGetUniformLocation(glamor_priv->finish_access_prog[0], "sampler");
"sampler"); glUseProgram(glamor_priv->finish_access_prog[0]);
dispatch->glUseProgram(glamor_priv->finish_access_prog[0]); glUniform1i(sampler_uniform_location, 0);
dispatch->glUniform1i(sampler_uniform_location, 0); glUniform1i(glamor_priv->finish_access_revert[0], 0);
dispatch->glUniform1i(glamor_priv->finish_access_revert[0], 0); glUniform1i(glamor_priv->finish_access_swap_rb[0], 0);
dispatch->glUniform1i(glamor_priv->finish_access_swap_rb[0], 0); glUseProgram(0);
dispatch->glUseProgram(0);
glamor_priv->finish_access_revert[1] = glamor_priv->finish_access_revert[1] =
dispatch->glGetUniformLocation(glamor_priv->finish_access_prog[1], glGetUniformLocation(glamor_priv->finish_access_prog[1], "revert");
"revert");
glamor_priv->finish_access_swap_rb[1] = glamor_priv->finish_access_swap_rb[1] =
dispatch->glGetUniformLocation(glamor_priv->finish_access_prog[1], glGetUniformLocation(glamor_priv->finish_access_prog[1], "swap_rb");
"swap_rb");
sampler_uniform_location = sampler_uniform_location =
dispatch->glGetUniformLocation(glamor_priv->finish_access_prog[1], glGetUniformLocation(glamor_priv->finish_access_prog[1], "sampler");
"sampler"); glUseProgram(glamor_priv->finish_access_prog[1]);
dispatch->glUseProgram(glamor_priv->finish_access_prog[1]); glUniform1i(glamor_priv->finish_access_revert[1], 0);
dispatch->glUniform1i(glamor_priv->finish_access_revert[1], 0); glUniform1i(sampler_uniform_location, 0);
dispatch->glUniform1i(sampler_uniform_location, 0); glUniform1i(glamor_priv->finish_access_swap_rb[1], 0);
dispatch->glUniform1i(glamor_priv->finish_access_swap_rb[1], 0); glUseProgram(0);
dispatch->glUseProgram(0); glamor_put_context(glamor_priv);
glamor_put_dispatch(glamor_priv);
} }
void void
glamor_fini_finish_access_shaders(ScreenPtr screen) glamor_fini_finish_access_shaders(ScreenPtr screen)
{ {
glamor_screen_private *glamor_priv; glamor_screen_private *glamor_priv;
glamor_gl_dispatch *dispatch;
glamor_priv = glamor_get_screen_private(screen); glamor_priv = glamor_get_screen_private(screen);
dispatch = glamor_get_dispatch(glamor_priv); glamor_get_context(glamor_priv);
dispatch->glDeleteProgram(glamor_priv->finish_access_prog[0]); glDeleteProgram(glamor_priv->finish_access_prog[0]);
dispatch->glDeleteProgram(glamor_priv->finish_access_prog[1]); glDeleteProgram(glamor_priv->finish_access_prog[1]);
glamor_put_dispatch(glamor_priv); glamor_put_context(glamor_priv);
} }
void void
@ -315,15 +305,13 @@ glamor_finish_access(DrawablePtr drawable, glamor_access_t access_mode)
} }
if (pixmap_priv->base.fbo->pbo != 0 && pixmap_priv->base.fbo->pbo_valid) { if (pixmap_priv->base.fbo->pbo != 0 && pixmap_priv->base.fbo->pbo_valid) {
glamor_gl_dispatch *dispatch;
assert(glamor_priv->gl_flavor == GLAMOR_GL_DESKTOP); assert(glamor_priv->gl_flavor == GLAMOR_GL_DESKTOP);
dispatch = glamor_get_dispatch(glamor_priv); glamor_get_context(glamor_priv);
dispatch->glBindBuffer(GL_PIXEL_PACK_BUFFER, 0); glBindBuffer(GL_PIXEL_PACK_BUFFER, 0);
dispatch->glBindBuffer(GL_PIXEL_UNPACK_BUFFER, 0); glBindBuffer(GL_PIXEL_UNPACK_BUFFER, 0);
dispatch->glDeleteBuffers(1, &pixmap_priv->base.fbo->pbo); glDeleteBuffers(1, &pixmap_priv->base.fbo->pbo);
glamor_put_dispatch(glamor_priv); glamor_put_context(glamor_priv);
pixmap_priv->base.fbo->pbo_valid = FALSE; pixmap_priv->base.fbo->pbo_valid = FALSE;
pixmap_priv->base.fbo->pbo = 0; pixmap_priv->base.fbo->pbo = 0;

182
glamor/glamor_egl.c
View File

@ -37,8 +37,6 @@
#include <errno.h> #include <errno.h>
#include <xf86.h> #include <xf86.h>
#include <xf86drm.h> #include <xf86drm.h>
#define GL_GLEXT_PROTOTYPES
#define EGL_EGLEXT_PROTOTYPES
#define EGL_DISPLAY_NO_X_MESA #define EGL_DISPLAY_NO_X_MESA
#ifdef GLAMOR_HAS_GBM #ifdef GLAMOR_HAS_GBM
@ -46,19 +44,12 @@
#include <drm_fourcc.h> #include <drm_fourcc.h>
#endif #endif
#if GLAMOR_GLES2
#include <GLES2/gl2.h>
#include <GLES2/gl2ext.h>
#else
#include <GL/gl.h>
#endif
#define MESA_EGL_NO_X11_HEADERS #define MESA_EGL_NO_X11_HEADERS
#include <EGL/egl.h> #include <epoxy/gl.h>
#include <EGL/eglext.h> #include <epoxy/egl.h>
#include "glamor.h" #include "glamor.h"
#include "glamor_gl_dispatch.h" #include "glamor_priv.h"
static const char glamor_name[] = "glamor"; static const char glamor_name[] = "glamor";
@ -91,16 +82,13 @@ struct glamor_egl_screen_private {
int gl_context_depth; int gl_context_depth;
int dri3_capable; int dri3_capable;
PFNEGLCREATEIMAGEKHRPROC egl_create_image_khr;
PFNEGLDESTROYIMAGEKHRPROC egl_destroy_image_khr;
PFNGLEGLIMAGETARGETTEXTURE2DOESPROC egl_image_target_texture2d_oes;
struct glamor_gl_dispatch *dispatch;
CloseScreenProcPtr saved_close_screen; CloseScreenProcPtr saved_close_screen;
xf86FreeScreenProc *saved_free_screen; xf86FreeScreenProc *saved_free_screen;
}; };
int xf86GlamorEGLPrivateIndex = -1; int xf86GlamorEGLPrivateIndex = -1;
static struct glamor_egl_screen_private * static struct glamor_egl_screen_private *
glamor_egl_get_screen_private(ScrnInfoPtr scrn) glamor_egl_get_screen_private(ScrnInfoPtr scrn)
{ {
@ -108,38 +96,30 @@ glamor_egl_get_screen_private(ScrnInfoPtr scrn)
scrn->privates[xf86GlamorEGLPrivateIndex].ptr; scrn->privates[xf86GlamorEGLPrivateIndex].ptr;
} }
_X_EXPORT void static void
glamor_egl_make_current(ScreenPtr screen) glamor_egl_get_context(struct glamor_context *glamor_ctx)
{ {
ScrnInfoPtr scrn = xf86ScreenToScrn(screen); if (glamor_ctx->get_count++)
struct glamor_egl_screen_private *glamor_egl =
glamor_egl_get_screen_private(scrn);
if (glamor_egl->gl_context_depth++)
return; return;
if (glamor_egl->context != eglGetCurrentContext()) { if (glamor_ctx->ctx != eglGetCurrentContext()) {
eglMakeCurrent(glamor_egl->display, EGL_NO_SURFACE, eglMakeCurrent(glamor_ctx->display, EGL_NO_SURFACE,
EGL_NO_SURFACE, EGL_NO_CONTEXT); EGL_NO_SURFACE, EGL_NO_CONTEXT);
if (!eglMakeCurrent(glamor_egl->display, if (!eglMakeCurrent(glamor_ctx->display,
EGL_NO_SURFACE, EGL_NO_SURFACE, EGL_NO_SURFACE, EGL_NO_SURFACE,
glamor_egl->context)) { glamor_ctx->ctx)) {
FatalError("Failed to make EGL context current\n"); FatalError("Failed to make EGL context current\n");
} }
} }
} }
_X_EXPORT void static void
glamor_egl_restore_context(ScreenPtr screen) glamor_egl_put_context(struct glamor_context *glamor_ctx)
{ {
ScrnInfoPtr scrn = xf86ScreenToScrn(screen); if (--glamor_ctx->get_count)
struct glamor_egl_screen_private *glamor_egl =
glamor_egl_get_screen_private(scrn);
if (--glamor_egl->gl_context_depth)
return; return;
eglMakeCurrent(glamor_egl->display, EGL_NO_SURFACE, eglMakeCurrent(glamor_ctx->display, EGL_NO_SURFACE,
EGL_NO_SURFACE, EGL_NO_CONTEXT); EGL_NO_SURFACE, EGL_NO_CONTEXT);
} }
@ -164,11 +144,11 @@ _glamor_egl_create_image(struct glamor_egl_screen_private *glamor_egl,
attribs[5] = stride; attribs[5] = stride;
if (depth != 32 && depth != 24) if (depth != 32 && depth != 24)
return EGL_NO_IMAGE_KHR; return EGL_NO_IMAGE_KHR;
image = glamor_egl->egl_create_image_khr(glamor_egl->display, image = eglCreateImageKHR(glamor_egl->display,
glamor_egl->context, glamor_egl->context,
EGL_DRM_BUFFER_MESA, EGL_DRM_BUFFER_MESA,
(void *) (uintptr_t) name, (void *) (uintptr_t) name,
attribs); attribs);
if (image == EGL_NO_IMAGE_KHR) if (image == EGL_NO_IMAGE_KHR)
return EGL_NO_IMAGE_KHR; return EGL_NO_IMAGE_KHR;
@ -192,15 +172,13 @@ glamor_create_texture_from_image(struct glamor_egl_screen_private
*glamor_egl, *glamor_egl,
EGLImageKHR image, GLuint * texture) EGLImageKHR image, GLuint * texture)
{ {
glamor_egl->dispatch->glGenTextures(1, texture); glGenTextures(1, texture);
glamor_egl->dispatch->glBindTexture(GL_TEXTURE_2D, *texture); glBindTexture(GL_TEXTURE_2D, *texture);
glamor_egl->dispatch->glTexParameteri(GL_TEXTURE_2D, glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST);
GL_TEXTURE_MIN_FILTER, GL_NEAREST); glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
glamor_egl->dispatch->glTexParameteri(GL_TEXTURE_2D,
GL_TEXTURE_MAG_FILTER, GL_NEAREST);
(glamor_egl->egl_image_target_texture2d_oes) (GL_TEXTURE_2D, image); glEGLImageTargetTexture2DOES(GL_TEXTURE_2D, image);
glamor_egl->dispatch->glBindTexture(GL_TEXTURE_2D, 0); glBindTexture(GL_TEXTURE_2D, 0);
return TRUE; return TRUE;
} }
@ -212,7 +190,7 @@ glamor_egl_create_argb8888_based_texture(ScreenPtr screen, int w, int h)
EGLImageKHR image; EGLImageKHR image;
GLuint texture; GLuint texture;
#ifdef GLAMOR_HAS_DRI3_SUPPORT #ifdef GLAMOR_HAS_GBM
struct gbm_bo *bo; struct gbm_bo *bo;
EGLNativePixmapType native_pixmap; EGLNativePixmapType native_pixmap;
@ -228,15 +206,15 @@ glamor_egl_create_argb8888_based_texture(ScreenPtr screen, int w, int h)
* compile with dri3 support enabled */ * compile with dri3 support enabled */
native_pixmap = bo; native_pixmap = bo;
image = glamor_egl->egl_create_image_khr(glamor_egl->display, image = eglCreateImageKHR(glamor_egl->display,
EGL_NO_CONTEXT, EGL_NO_CONTEXT,
EGL_NATIVE_PIXMAP_KHR, EGL_NATIVE_PIXMAP_KHR,
native_pixmap, NULL); native_pixmap, NULL);
gbm_bo_destroy(bo); gbm_bo_destroy(bo);
if (image == EGL_NO_IMAGE_KHR) if (image == EGL_NO_IMAGE_KHR)
return 0; return 0;
glamor_create_texture_from_image(glamor_egl, image, &texture); glamor_create_texture_from_image(glamor_egl, image, &texture);
glamor_egl->egl_destroy_image_khr(glamor_egl->display, image); eglDestroyImageKHR(glamor_egl->display, image);
return texture; return texture;
#else #else
@ -300,6 +278,8 @@ glamor_egl_create_textured_pixmap(PixmapPtr pixmap, int handle, int stride)
{ {
ScreenPtr screen = pixmap->drawable.pScreen; ScreenPtr screen = pixmap->drawable.pScreen;
ScrnInfoPtr scrn = xf86ScreenToScrn(screen); ScrnInfoPtr scrn = xf86ScreenToScrn(screen);
struct glamor_screen_private *glamor_priv =
glamor_get_screen_private(screen);
struct glamor_egl_screen_private *glamor_egl; struct glamor_egl_screen_private *glamor_egl;
EGLImageKHR image; EGLImageKHR image;
GLuint texture; GLuint texture;
@ -308,7 +288,7 @@ glamor_egl_create_textured_pixmap(PixmapPtr pixmap, int handle, int stride)
glamor_egl = glamor_egl_get_screen_private(scrn); glamor_egl = glamor_egl_get_screen_private(scrn);
glamor_egl_make_current(screen); glamor_get_context(glamor_priv);
if (glamor_egl->has_gem) { if (glamor_egl->has_gem) {
if (!glamor_get_flink_name(glamor_egl->fd, handle, &name)) { if (!glamor_get_flink_name(glamor_egl->fd, handle, &name)) {
xf86DrvMsg(scrn->scrnIndex, X_ERROR, xf86DrvMsg(scrn->scrnIndex, X_ERROR,
@ -338,7 +318,7 @@ glamor_egl_create_textured_pixmap(PixmapPtr pixmap, int handle, int stride)
ret = TRUE; ret = TRUE;
done: done:
glamor_egl_restore_context(screen); glamor_put_context(glamor_priv);
return ret; return ret;
} }
@ -347,6 +327,8 @@ glamor_egl_create_textured_pixmap_from_gbm_bo(PixmapPtr pixmap, void *bo)
{ {
ScreenPtr screen = pixmap->drawable.pScreen; ScreenPtr screen = pixmap->drawable.pScreen;
ScrnInfoPtr scrn = xf86ScreenToScrn(screen); ScrnInfoPtr scrn = xf86ScreenToScrn(screen);
struct glamor_screen_private *glamor_priv =
glamor_get_screen_private(screen);
struct glamor_egl_screen_private *glamor_egl; struct glamor_egl_screen_private *glamor_egl;
EGLImageKHR image; EGLImageKHR image;
GLuint texture; GLuint texture;
@ -354,11 +336,11 @@ glamor_egl_create_textured_pixmap_from_gbm_bo(PixmapPtr pixmap, void *bo)
glamor_egl = glamor_egl_get_screen_private(scrn); glamor_egl = glamor_egl_get_screen_private(scrn);
glamor_egl_make_current(screen); glamor_get_context(glamor_priv);
image = glamor_egl->egl_create_image_khr(glamor_egl->display, image = eglCreateImageKHR(glamor_egl->display,
glamor_egl->context, glamor_egl->context,
EGL_NATIVE_PIXMAP_KHR, bo, NULL); EGL_NATIVE_PIXMAP_KHR, bo, NULL);
if (image == EGL_NO_IMAGE_KHR) { if (image == EGL_NO_IMAGE_KHR) {
glamor_set_pixmap_type(pixmap, GLAMOR_DRM_ONLY); glamor_set_pixmap_type(pixmap, GLAMOR_DRM_ONLY);
goto done; goto done;
@ -370,11 +352,11 @@ glamor_egl_create_textured_pixmap_from_gbm_bo(PixmapPtr pixmap, void *bo)
ret = TRUE; ret = TRUE;
done: done:
glamor_egl_restore_context(screen); glamor_put_context(glamor_priv);
return ret; return ret;
} }
#ifdef GLAMOR_HAS_DRI3_SUPPORT #ifdef GLAMOR_HAS_GBM
int glamor_get_fd_from_bo(int gbm_fd, struct gbm_bo *bo, int *fd); int glamor_get_fd_from_bo(int gbm_fd, struct gbm_bo *bo, int *fd);
void glamor_get_name_from_bo(int gbm_fd, struct gbm_bo *bo, int *name); void glamor_get_name_from_bo(int gbm_fd, struct gbm_bo *bo, int *name);
int int
@ -409,8 +391,10 @@ glamor_egl_dri3_fd_name_from_tex(ScreenPtr screen,
unsigned int tex, unsigned int tex,
Bool want_name, CARD16 *stride, CARD32 *size) Bool want_name, CARD16 *stride, CARD32 *size)
{ {
#ifdef GLAMOR_HAS_DRI3_SUPPORT #ifdef GLAMOR_HAS_GBM
ScrnInfoPtr scrn = xf86ScreenToScrn(screen); ScrnInfoPtr scrn = xf86ScreenToScrn(screen);
struct glamor_screen_private *glamor_priv =
glamor_get_screen_private(screen);
struct glamor_egl_screen_private *glamor_egl; struct glamor_egl_screen_private *glamor_egl;
EGLImageKHR image; EGLImageKHR image;
struct gbm_bo *bo; struct gbm_bo *bo;
@ -424,17 +408,17 @@ glamor_egl_dri3_fd_name_from_tex(ScreenPtr screen,
glamor_egl = glamor_egl_get_screen_private(scrn); glamor_egl = glamor_egl_get_screen_private(scrn);
glamor_egl_make_current(screen); glamor_get_context(glamor_priv);
image = dixLookupPrivate(&pixmap->devPrivates, image = dixLookupPrivate(&pixmap->devPrivates,
glamor_egl_pixmap_private_key); glamor_egl_pixmap_private_key);
if (image == EGL_NO_IMAGE_KHR || image == NULL) { if (image == EGL_NO_IMAGE_KHR || image == NULL) {
image = glamor_egl->egl_create_image_khr(glamor_egl->display, image = eglCreateImageKHR(glamor_egl->display,
glamor_egl->context, glamor_egl->context,
EGL_GL_TEXTURE_2D_KHR, EGL_GL_TEXTURE_2D_KHR,
(EGLClientBuffer) (uintptr_t) (EGLClientBuffer) (uintptr_t)
tex, attribs); tex, attribs);
if (image == EGL_NO_IMAGE_KHR) if (image == EGL_NO_IMAGE_KHR)
goto failure; goto failure;
@ -462,7 +446,7 @@ glamor_egl_dri3_fd_name_from_tex(ScreenPtr screen,
gbm_bo_destroy(bo); gbm_bo_destroy(bo);
failure: failure:
glamor_egl_restore_context(screen); glamor_put_context(glamor_priv);
return fd; return fd;
#else #else
return -1; return -1;
@ -476,7 +460,7 @@ glamor_egl_dri3_pixmap_from_fd(ScreenPtr screen,
CARD16 height, CARD16 height,
CARD16 stride, CARD8 depth, CARD8 bpp) CARD16 stride, CARD8 depth, CARD8 bpp)
{ {
#ifdef GLAMOR_HAS_DRI3_SUPPORT #ifdef GLAMOR_HAS_GBM
ScrnInfoPtr scrn = xf86ScreenToScrn(screen); ScrnInfoPtr scrn = xf86ScreenToScrn(screen);
struct glamor_egl_screen_private *glamor_egl; struct glamor_egl_screen_private *glamor_egl;
struct gbm_bo *bo; struct gbm_bo *bo;
@ -506,10 +490,10 @@ glamor_egl_dri3_pixmap_from_fd(ScreenPtr screen,
attribs[3] = height; attribs[3] = height;
attribs[7] = fd; attribs[7] = fd;
attribs[11] = stride; attribs[11] = stride;
image = glamor_egl->egl_create_image_khr(glamor_egl->display, image = eglCreateImageKHR(glamor_egl->display,
EGL_NO_CONTEXT, EGL_NO_CONTEXT,
EGL_LINUX_DMA_BUF_EXT, EGL_LINUX_DMA_BUF_EXT,
NULL, attribs); NULL, attribs);
if (image == EGL_NO_IMAGE_KHR) if (image == EGL_NO_IMAGE_KHR)
return NULL; return NULL;
@ -518,7 +502,7 @@ glamor_egl_dri3_pixmap_from_fd(ScreenPtr screen,
* usage of the image. Use gbm_bo to bypass the limitations. */ * usage of the image. Use gbm_bo to bypass the limitations. */
bo = gbm_bo_import(glamor_egl->gbm, GBM_BO_IMPORT_EGL_IMAGE, image, 0); bo = gbm_bo_import(glamor_egl->gbm, GBM_BO_IMPORT_EGL_IMAGE, image, 0);
glamor_egl->egl_destroy_image_khr(glamor_egl->display, image); eglDestroyImageKHR(glamor_egl->display, image);
if (!bo) if (!bo)
return NULL; return NULL;
@ -555,7 +539,7 @@ _glamor_egl_destroy_pixmap_image(PixmapPtr pixmap)
* a texture. we must call glFlush to make sure the * a texture. we must call glFlush to make sure the
* operation on that texture has been done.*/ * operation on that texture has been done.*/
glamor_block_handler(pixmap->drawable.pScreen); glamor_block_handler(pixmap->drawable.pScreen);
glamor_egl->egl_destroy_image_khr(glamor_egl->display, image); eglDestroyImageKHR(glamor_egl->display, image);
dixSetPrivate(&pixmap->devPrivates, glamor_egl_pixmap_private_key, dixSetPrivate(&pixmap->devPrivates, glamor_egl_pixmap_private_key,
NULL); NULL);
} }
@ -605,8 +589,7 @@ glamor_egl_close_screen(ScreenPtr screen)
glamor_egl = glamor_egl_get_screen_private(scrn); glamor_egl = glamor_egl_get_screen_private(scrn);
screen_pixmap = screen->GetScreenPixmap(screen); screen_pixmap = screen->GetScreenPixmap(screen);
glamor_egl->egl_destroy_image_khr(glamor_egl->display, eglDestroyImageKHR(glamor_egl->display,glamor_egl->front_image);
glamor_egl->front_image);
dixSetPrivate(&screen_pixmap->devPrivates, glamor_egl_pixmap_private_key, dixSetPrivate(&screen_pixmap->devPrivates, glamor_egl_pixmap_private_key,
NULL); NULL);
glamor_egl->front_image = NULL; glamor_egl->front_image = NULL;
@ -614,7 +597,7 @@ glamor_egl_close_screen(ScreenPtr screen)
back_image = dixLookupPrivate(&(*glamor_egl->back_pixmap)->devPrivates, back_image = dixLookupPrivate(&(*glamor_egl->back_pixmap)->devPrivates,
glamor_egl_pixmap_private_key); glamor_egl_pixmap_private_key);
if (back_image != NULL && back_image != EGL_NO_IMAGE_KHR) { if (back_image != NULL && back_image != EGL_NO_IMAGE_KHR) {
glamor_egl->egl_destroy_image_khr(glamor_egl->display, back_image); eglDestroyImageKHR(glamor_egl->display, back_image);
dixSetPrivate(&(*glamor_egl->back_pixmap)->devPrivates, dixSetPrivate(&(*glamor_egl->back_pixmap)->devPrivates,
glamor_egl_pixmap_private_key, NULL); glamor_egl_pixmap_private_key, NULL);
} }
@ -645,7 +628,7 @@ glamor_egl_has_extension(struct glamor_egl_screen_private *glamor_egl,
} }
void void
glamor_egl_screen_init(ScreenPtr screen) glamor_egl_screen_init(ScreenPtr screen, struct glamor_context *glamor_ctx)
{ {
ScrnInfoPtr scrn = xf86ScreenToScrn(screen); ScrnInfoPtr scrn = xf86ScreenToScrn(screen);
struct glamor_egl_screen_private *glamor_egl = struct glamor_egl_screen_private *glamor_egl =
@ -653,6 +636,12 @@ glamor_egl_screen_init(ScreenPtr screen)
glamor_egl->saved_close_screen = screen->CloseScreen; glamor_egl->saved_close_screen = screen->CloseScreen;
screen->CloseScreen = glamor_egl_close_screen; screen->CloseScreen = glamor_egl_close_screen;
glamor_ctx->ctx = glamor_egl->context;
glamor_ctx->display = glamor_egl->display;
glamor_ctx->get_context = glamor_egl_get_context;
glamor_ctx->put_context = glamor_egl_put_context;
} }
static void static void
@ -746,26 +735,11 @@ glamor_egl_init(ScrnInfoPtr scrn, int fd)
KHR_surfaceless_opengl); KHR_surfaceless_opengl);
#endif #endif
#ifdef GLAMOR_HAS_DRI3_SUPPORT #ifdef GLAMOR_HAS_GBM
if (glamor_egl_has_extension(glamor_egl, "EGL_KHR_gl_texture_2D_image") && if (glamor_egl_has_extension(glamor_egl, "EGL_KHR_gl_texture_2D_image") &&
glamor_egl_has_extension(glamor_egl, "EGL_EXT_image_dma_buf_import")) glamor_egl_has_extension(glamor_egl, "EGL_EXT_image_dma_buf_import"))
glamor_egl->dri3_capable = TRUE; glamor_egl->dri3_capable = TRUE;
#endif #endif
glamor_egl->egl_create_image_khr = (PFNEGLCREATEIMAGEKHRPROC)
eglGetProcAddress("eglCreateImageKHR");
glamor_egl->egl_destroy_image_khr = (PFNEGLDESTROYIMAGEKHRPROC)
eglGetProcAddress("eglDestroyImageKHR");
glamor_egl->egl_image_target_texture2d_oes =
(PFNGLEGLIMAGETARGETTEXTURE2DOESPROC)
eglGetProcAddress("glEGLImageTargetTexture2DOES");
if (!glamor_egl->egl_create_image_khr
|| !glamor_egl->egl_image_target_texture2d_oes) {
xf86DrvMsg(scrn->scrnIndex, X_ERROR, "eglGetProcAddress() failed\n");
return FALSE;
}
glamor_egl->context = eglCreateContext(glamor_egl->display, glamor_egl->context = eglCreateContext(glamor_egl->display,
NULL, EGL_NO_CONTEXT, NULL, EGL_NO_CONTEXT,
@ -809,17 +783,3 @@ glamor_egl_init_textured_pixmap(ScreenPtr screen)
glamor_enable_dri3(screen); glamor_enable_dri3(screen);
return TRUE; return TRUE;
} }
Bool
glamor_gl_dispatch_init(ScreenPtr screen,
struct glamor_gl_dispatch *dispatch, int gl_version)
{
ScrnInfoPtr scrn = xf86ScreenToScrn(screen);
struct glamor_egl_screen_private *glamor_egl =
glamor_egl_get_screen_private(scrn);
if (!glamor_gl_dispatch_init_impl
(dispatch, gl_version, (get_proc_address_t) eglGetProcAddress))
return FALSE;
glamor_egl->dispatch = dispatch;
return TRUE;
}

12
glamor/glamor_egl_stubs.c
View File

@ -29,7 +29,7 @@
#include "glamor_priv.h" #include "glamor_priv.h"
void void
glamor_egl_screen_init(ScreenPtr screen) glamor_egl_screen_init(ScreenPtr screen, struct glamor_context *glamor_ctx)
{ {
} }
@ -38,16 +38,6 @@ glamor_egl_destroy_textured_pixmap(PixmapPtr pixmap)
{ {
} }
void
glamor_egl_make_current(ScreenPtr screen)
{
}
void
glamor_egl_restore_context(ScreenPtr screen)
{
}
int int
glamor_egl_dri3_fd_name_from_tex(ScreenPtr screen, glamor_egl_dri3_fd_name_from_tex(ScreenPtr screen,
PixmapPtr pixmap, PixmapPtr pixmap,

53
glamor/glamor_fbo.c
View File

@ -129,15 +129,15 @@ glamor_pixmap_fbo_cache_get(glamor_screen_private *glamor_priv,
void void
glamor_purge_fbo(glamor_pixmap_fbo *fbo) glamor_purge_fbo(glamor_pixmap_fbo *fbo)
{ {
glamor_gl_dispatch *dispatch = glamor_get_dispatch(fbo->glamor_priv); glamor_get_context(fbo->glamor_priv);
if (fbo->fb) if (fbo->fb)
dispatch->glDeleteFramebuffers(1, &fbo->fb); glDeleteFramebuffers(1, &fbo->fb);
if (fbo->tex) if (fbo->tex)
dispatch->glDeleteTextures(1, &fbo->tex); glDeleteTextures(1, &fbo->tex);
if (fbo->pbo) if (fbo->pbo)
dispatch->glDeleteBuffers(1, &fbo->pbo); glDeleteBuffers(1, &fbo->pbo);
glamor_put_dispatch(fbo->glamor_priv); glamor_put_context(fbo->glamor_priv);
free(fbo); free(fbo);
} }
@ -178,19 +178,17 @@ glamor_pixmap_fbo_cache_put(glamor_pixmap_fbo *fbo)
static void static void
glamor_pixmap_ensure_fb(glamor_pixmap_fbo *fbo) glamor_pixmap_ensure_fb(glamor_pixmap_fbo *fbo)
{ {
glamor_gl_dispatch *dispatch;
int status; int status;
dispatch = glamor_get_dispatch(fbo->glamor_priv); glamor_get_context(fbo->glamor_priv);
if (fbo->fb == 0) if (fbo->fb == 0)
dispatch->glGenFramebuffers(1, &fbo->fb); glGenFramebuffers(1, &fbo->fb);
assert(fbo->tex != 0); assert(fbo->tex != 0);
dispatch->glBindFramebuffer(GL_FRAMEBUFFER, fbo->fb); glBindFramebuffer(GL_FRAMEBUFFER, fbo->fb);
dispatch->glFramebufferTexture2D(GL_FRAMEBUFFER, glFramebufferTexture2D(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0,
GL_COLOR_ATTACHMENT0, GL_TEXTURE_2D, fbo->tex, 0);
GL_TEXTURE_2D, fbo->tex, 0); status = glCheckFramebufferStatus(GL_FRAMEBUFFER);
status = dispatch->glCheckFramebufferStatus(GL_FRAMEBUFFER);
if (status != GL_FRAMEBUFFER_COMPLETE) { if (status != GL_FRAMEBUFFER_COMPLETE) {
const char *str; const char *str;
@ -221,7 +219,7 @@ glamor_pixmap_ensure_fb(glamor_pixmap_fbo *fbo)
FatalError("destination is framebuffer incomplete: %s [%x]\n", FatalError("destination is framebuffer incomplete: %s [%x]\n",
str, status); str, status);
} }
glamor_put_dispatch(fbo->glamor_priv); glamor_put_context(fbo->glamor_priv);
} }
glamor_pixmap_fbo * glamor_pixmap_fbo *
@ -243,11 +241,9 @@ glamor_create_fbo_from_tex(glamor_screen_private *glamor_priv,
fbo->glamor_priv = glamor_priv; fbo->glamor_priv = glamor_priv;
if (flag == GLAMOR_CREATE_PIXMAP_MAP) { if (flag == GLAMOR_CREATE_PIXMAP_MAP) {
glamor_gl_dispatch *dispatch; glamor_get_context(glamor_priv);
glGenBuffers(1, &fbo->pbo);
dispatch = glamor_get_dispatch(glamor_priv); glamor_put_context(glamor_priv);
dispatch->glGenBuffers(1, &fbo->pbo);
glamor_put_dispatch(glamor_priv);
goto done; goto done;
} }
@ -334,7 +330,6 @@ static int
_glamor_create_tex(glamor_screen_private *glamor_priv, _glamor_create_tex(glamor_screen_private *glamor_priv,
int w, int h, GLenum format) int w, int h, GLenum format)
{ {
glamor_gl_dispatch *dispatch;
unsigned int tex = 0; unsigned int tex = 0;
/* With dri3, we want to allocate ARGB8888 pixmaps only. /* With dri3, we want to allocate ARGB8888 pixmaps only.
@ -346,16 +341,14 @@ _glamor_create_tex(glamor_screen_private *glamor_priv,
w, h); w, h);
} }
if (!tex) { if (!tex) {
dispatch = glamor_get_dispatch(glamor_priv); glamor_get_context(glamor_priv);
dispatch->glGenTextures(1, &tex); glGenTextures(1, &tex);
dispatch->glBindTexture(GL_TEXTURE_2D, tex); glBindTexture(GL_TEXTURE_2D, tex);
dispatch->glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST);
GL_NEAREST); glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
dispatch->glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, glTexImage2D(GL_TEXTURE_2D, 0, format, w, h, 0,
GL_NEAREST); format, GL_UNSIGNED_BYTE, NULL);
dispatch->glTexImage2D(GL_TEXTURE_2D, 0, format, w, h, 0, glamor_put_context(glamor_priv);
format, GL_UNSIGNED_BYTE, NULL);
glamor_put_dispatch(glamor_priv);
} }
return tex; return tex;
} }

83
glamor/glamor_fill.c
View File

@ -137,7 +137,6 @@ void
glamor_init_solid_shader(ScreenPtr screen) glamor_init_solid_shader(ScreenPtr screen)
{ {
glamor_screen_private *glamor_priv; glamor_screen_private *glamor_priv;
glamor_gl_dispatch *dispatch;
const char *solid_vs = const char *solid_vs =
"attribute vec4 v_position;" "attribute vec4 v_position;"
"void main()\n" "void main()\n"
@ -154,32 +153,31 @@ glamor_init_solid_shader(ScreenPtr screen)
GLint fs_prog, vs_prog; GLint fs_prog, vs_prog;
glamor_priv = glamor_get_screen_private(screen); glamor_priv = glamor_get_screen_private(screen);
dispatch = glamor_get_dispatch(glamor_priv); glamor_get_context(glamor_priv);
glamor_priv->solid_prog = dispatch->glCreateProgram(); glamor_priv->solid_prog = glCreateProgram();
vs_prog = glamor_compile_glsl_prog(dispatch, GL_VERTEX_SHADER, solid_vs); vs_prog = glamor_compile_glsl_prog(GL_VERTEX_SHADER, solid_vs);
fs_prog = glamor_compile_glsl_prog(dispatch, GL_FRAGMENT_SHADER, solid_fs); fs_prog = glamor_compile_glsl_prog(GL_FRAGMENT_SHADER, solid_fs);
dispatch->glAttachShader(glamor_priv->solid_prog, vs_prog); glAttachShader(glamor_priv->solid_prog, vs_prog);
dispatch->glAttachShader(glamor_priv->solid_prog, fs_prog); glAttachShader(glamor_priv->solid_prog, fs_prog);
dispatch->glBindAttribLocation(glamor_priv->solid_prog, glBindAttribLocation(glamor_priv->solid_prog,
GLAMOR_VERTEX_POS, "v_position"); GLAMOR_VERTEX_POS, "v_position");
glamor_link_glsl_prog(dispatch, glamor_priv->solid_prog); glamor_link_glsl_prog(glamor_priv->solid_prog);
glamor_priv->solid_color_uniform_location = glamor_priv->solid_color_uniform_location =
dispatch->glGetUniformLocation(glamor_priv->solid_prog, "color"); glGetUniformLocation(glamor_priv->solid_prog, "color");
glamor_put_dispatch(glamor_priv); glamor_put_context(glamor_priv);
} }
void void
glamor_fini_solid_shader(ScreenPtr screen) glamor_fini_solid_shader(ScreenPtr screen)
{ {
glamor_screen_private *glamor_priv; glamor_screen_private *glamor_priv;
glamor_gl_dispatch *dispatch;
glamor_priv = glamor_get_screen_private(screen); glamor_priv = glamor_get_screen_private(screen);
dispatch = glamor_get_dispatch(glamor_priv); glamor_get_context(glamor_priv);
dispatch->glDeleteProgram(glamor_priv->solid_prog); glDeleteProgram(glamor_priv->solid_prog);
glamor_put_dispatch(glamor_priv); glamor_put_context(glamor_priv);
} }
static void static void
@ -188,7 +186,6 @@ _glamor_solid_boxes(PixmapPtr pixmap, BoxPtr box, int nbox, float *color)
ScreenPtr screen = pixmap->drawable.pScreen; ScreenPtr screen = pixmap->drawable.pScreen;
glamor_screen_private *glamor_priv = glamor_get_screen_private(screen); glamor_screen_private *glamor_priv = glamor_get_screen_private(screen);
glamor_pixmap_private *pixmap_priv = glamor_get_pixmap_private(pixmap); glamor_pixmap_private *pixmap_priv = glamor_get_pixmap_private(pixmap);
glamor_gl_dispatch *dispatch;
GLfloat xscale, yscale; GLfloat xscale, yscale;
float vertices[32]; float vertices[32];
float *pvertices = vertices; float *pvertices = vertices;
@ -196,10 +193,10 @@ _glamor_solid_boxes(PixmapPtr pixmap, BoxPtr box, int nbox, float *color)
glamor_set_destination_pixmap_priv_nc(pixmap_priv); glamor_set_destination_pixmap_priv_nc(pixmap_priv);
dispatch = glamor_get_dispatch(glamor_priv); glamor_get_context(glamor_priv);
dispatch->glUseProgram(glamor_priv->solid_prog); glUseProgram(glamor_priv->solid_prog);
dispatch->glUniform4fv(glamor_priv->solid_color_uniform_location, 1, color); glUniform4fv(glamor_priv->solid_color_uniform_location, 1, color);
pixmap_priv_get_dest_scale(pixmap_priv, &xscale, &yscale); pixmap_priv_get_dest_scale(pixmap_priv, &xscale, &yscale);
@ -221,11 +218,11 @@ _glamor_solid_boxes(PixmapPtr pixmap, BoxPtr box, int nbox, float *color)
} }
if (_X_UNLIKELY(nbox > 1)) if (_X_UNLIKELY(nbox > 1))
dispatch->glBindBuffer(GL_ELEMENT_ARRAY_BUFFER, glamor_priv->ebo); glBindBuffer(GL_ELEMENT_ARRAY_BUFFER, glamor_priv->ebo);
dispatch->glVertexAttribPointer(GLAMOR_VERTEX_POS, 2, GL_FLOAT, glVertexAttribPointer(GLAMOR_VERTEX_POS, 2, GL_FLOAT,
GL_FALSE, 2 * sizeof(float), pvertices); GL_FALSE, 2 * sizeof(float), pvertices);
dispatch->glEnableVertexAttribArray(GLAMOR_VERTEX_POS); glEnableVertexAttribArray(GLAMOR_VERTEX_POS);
while (nbox) { while (nbox) {
int box_cnt, i; int box_cnt, i;
@ -242,17 +239,16 @@ _glamor_solid_boxes(PixmapPtr pixmap, BoxPtr box, int nbox, float *color)
valid_vertices += 4 * 2; valid_vertices += 4 * 2;
} }
if (box_cnt == 1) if (box_cnt == 1)
dispatch->glDrawArrays(GL_TRIANGLE_FAN, 0, box_cnt * 4); glDrawArrays(GL_TRIANGLE_FAN, 0, box_cnt * 4);
else else {
#ifndef GLAMOR_GLES2 if (glamor_priv->gl_flavor == GLAMOR_GL_DESKTOP) {
dispatch->glDrawRangeElements(GL_TRIANGLES, glDrawRangeElements(GL_TRIANGLES, 0, box_cnt * 4, box_cnt * 6,
0, GL_UNSIGNED_SHORT, NULL);
box_cnt * 4, } else {
box_cnt * 6, GL_UNSIGNED_SHORT, NULL); glDrawElements(GL_TRIANGLES, box_cnt * 6, GL_UNSIGNED_SHORT,
#else NULL);
dispatch->glDrawElements(GL_TRIANGLES, }
box_cnt * 6, GL_UNSIGNED_SHORT, NULL); }
#endif
nbox -= box_cnt; nbox -= box_cnt;
box += box_cnt; box += box_cnt;
} }
@ -260,9 +256,9 @@ _glamor_solid_boxes(PixmapPtr pixmap, BoxPtr box, int nbox, float *color)
if (pvertices != vertices) if (pvertices != vertices)
free(pvertices); free(pvertices);
dispatch->glDisableVertexAttribArray(GLAMOR_VERTEX_POS); glDisableVertexAttribArray(GLAMOR_VERTEX_POS);
dispatch->glUseProgram(0); glUseProgram(0);
glamor_put_dispatch(glamor_priv); glamor_put_context(glamor_priv);
glamor_priv->state = RENDER_STATE; glamor_priv->state = RENDER_STATE;
glamor_priv->render_idle_cnt = 0; glamor_priv->render_idle_cnt = 0;
} }
@ -321,7 +317,6 @@ glamor_solid(PixmapPtr pixmap, int x, int y, int width, int height,
ScreenPtr screen = pixmap->drawable.pScreen; ScreenPtr screen = pixmap->drawable.pScreen;
glamor_screen_private *glamor_priv = glamor_get_screen_private(screen); glamor_screen_private *glamor_priv = glamor_get_screen_private(screen);
glamor_pixmap_private *pixmap_priv; glamor_pixmap_private *pixmap_priv;
glamor_gl_dispatch *dispatch;
BoxRec box; BoxRec box;
pixmap_priv = glamor_get_pixmap_private(pixmap); pixmap_priv = glamor_get_pixmap_private(pixmap);
@ -334,13 +329,13 @@ glamor_solid(PixmapPtr pixmap, int x, int y, int width, int height,
return FALSE; return FALSE;
} }
dispatch = glamor_get_dispatch(glamor_priv); glamor_get_context(glamor_priv);
if (!glamor_set_alu(dispatch, alu)) { if (!glamor_set_alu(screen, alu)) {
if (alu == GXclear) if (alu == GXclear)
fg_pixel = 0; fg_pixel = 0;
else { else {
glamor_fallback("unsupported alu %x\n", alu); glamor_fallback("unsupported alu %x\n", alu);
glamor_put_dispatch(glamor_priv); glamor_put_context(glamor_priv);
return FALSE; return FALSE;
} }
} }
@ -350,8 +345,8 @@ glamor_solid(PixmapPtr pixmap, int x, int y, int width, int height,
box.y2 = y + height; box.y2 = y + height;
glamor_solid_boxes(pixmap, &box, 1, fg_pixel); glamor_solid_boxes(pixmap, &box, 1, fg_pixel);
glamor_set_alu(dispatch, GXcopy); glamor_set_alu(screen, GXcopy);
glamor_put_dispatch(glamor_priv); glamor_put_context(glamor_priv);
return TRUE; return TRUE;
} }

118
glamor/glamor_gl_dispatch.c
View File

@ -1,118 +0,0 @@
/*
* Copyright © 2009 Intel Corporation
* Copyright © 1998 Keith Packard
*
* Permission is hereby granted, free of charge, to any person obtaining a
* copy of this software and associated documentation files (the "Software"),
* to deal in the Software without restriction, including without limitation
* the rights to use, copy, modify, merge, publish, distribute, sublicense,
* and/or sell copies of the Software, and to permit persons to whom the
* Software is furnished to do so, subject to the following conditions:
*
* The above copyright notice and this permission notice (including the next
* paragraph) shall be included in all copies or substantial portions of the
* Software.
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
* THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
* FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
* IN THE SOFTWARE.
*
* Authors:
* Zhigang Gong <zhigang.gong@gmail.com>
*
*/
#include "glamor_priv.h"
#include <dlfcn.h>
#define INIT_FUNC(dst,func_name,get) \
dst->func_name = get(#func_name); \
if (dst->func_name == NULL) { \
dst->func_name = (void *)dlsym(NULL, #func_name); \
if (dst->func_name == NULL) { \
ErrorF("Failed to get function %s\n", #func_name);\
goto fail; \
} \
} \
_X_EXPORT Bool
glamor_gl_dispatch_init_impl(struct glamor_gl_dispatch *dispatch,
int gl_version,
void *(*get_proc_address) (const char *))
{
#ifndef GLAMOR_GLES2
INIT_FUNC(dispatch, glMatrixMode, get_proc_address);
INIT_FUNC(dispatch, glLoadIdentity, get_proc_address);
INIT_FUNC(dispatch, glRasterPos2i, get_proc_address);
INIT_FUNC(dispatch, glDrawPixels, get_proc_address);
INIT_FUNC(dispatch, glLogicOp, get_proc_address);
INIT_FUNC(dispatch, glMapBuffer, get_proc_address);
INIT_FUNC(dispatch, glMapBufferRange, get_proc_address);
INIT_FUNC(dispatch, glUnmapBuffer, get_proc_address);
INIT_FUNC(dispatch, glBlitFramebuffer, get_proc_address);
INIT_FUNC(dispatch, glDrawRangeElements, get_proc_address);
#endif
INIT_FUNC(dispatch, glViewport, get_proc_address);
INIT_FUNC(dispatch, glDrawArrays, get_proc_address);
INIT_FUNC(dispatch, glDrawElements, get_proc_address);
INIT_FUNC(dispatch, glReadPixels, get_proc_address);
INIT_FUNC(dispatch, glPixelStorei, get_proc_address);
INIT_FUNC(dispatch, glTexParameteri, get_proc_address);
INIT_FUNC(dispatch, glTexImage2D, get_proc_address);
INIT_FUNC(dispatch, glGenTextures, get_proc_address);
INIT_FUNC(dispatch, glDeleteTextures, get_proc_address);
INIT_FUNC(dispatch, glBindTexture, get_proc_address);
INIT_FUNC(dispatch, glTexSubImage2D, get_proc_address);
INIT_FUNC(dispatch, glFlush, get_proc_address);
INIT_FUNC(dispatch, glFinish, get_proc_address);
INIT_FUNC(dispatch, glGetIntegerv, get_proc_address);
INIT_FUNC(dispatch, glGetString, get_proc_address);
INIT_FUNC(dispatch, glScissor, get_proc_address);
INIT_FUNC(dispatch, glEnable, get_proc_address);
INIT_FUNC(dispatch, glDisable, get_proc_address);
INIT_FUNC(dispatch, glBlendFunc, get_proc_address);
INIT_FUNC(dispatch, glActiveTexture, get_proc_address);
INIT_FUNC(dispatch, glGenBuffers, get_proc_address);
INIT_FUNC(dispatch, glBufferData, get_proc_address);
INIT_FUNC(dispatch, glBindBuffer, get_proc_address);
INIT_FUNC(dispatch, glDeleteBuffers, get_proc_address);
INIT_FUNC(dispatch, glFramebufferTexture2D, get_proc_address);
INIT_FUNC(dispatch, glBindFramebuffer, get_proc_address);
INIT_FUNC(dispatch, glDeleteFramebuffers, get_proc_address);
INIT_FUNC(dispatch, glGenFramebuffers, get_proc_address);
INIT_FUNC(dispatch, glCheckFramebufferStatus, get_proc_address);
INIT_FUNC(dispatch, glVertexAttribPointer, get_proc_address);
INIT_FUNC(dispatch, glDisableVertexAttribArray, get_proc_address);
INIT_FUNC(dispatch, glEnableVertexAttribArray, get_proc_address);
INIT_FUNC(dispatch, glBindAttribLocation, get_proc_address);
INIT_FUNC(dispatch, glLinkProgram, get_proc_address);
INIT_FUNC(dispatch, glShaderSource, get_proc_address);
INIT_FUNC(dispatch, glUseProgram, get_proc_address);
INIT_FUNC(dispatch, glUniform1i, get_proc_address);
INIT_FUNC(dispatch, glUniform1f, get_proc_address);
INIT_FUNC(dispatch, glUniform4f, get_proc_address);
INIT_FUNC(dispatch, glUniform4fv, get_proc_address);
INIT_FUNC(dispatch, glUniform1fv, get_proc_address);
INIT_FUNC(dispatch, glUniform2fv, get_proc_address);
INIT_FUNC(dispatch, glUniformMatrix3fv, get_proc_address);
INIT_FUNC(dispatch, glCreateProgram, get_proc_address);
INIT_FUNC(dispatch, glDeleteProgram, get_proc_address);
INIT_FUNC(dispatch, glCreateShader, get_proc_address);
INIT_FUNC(dispatch, glCompileShader, get_proc_address);
INIT_FUNC(dispatch, glAttachShader, get_proc_address);
INIT_FUNC(dispatch, glDeleteShader, get_proc_address);
INIT_FUNC(dispatch, glGetShaderiv, get_proc_address);
INIT_FUNC(dispatch, glGetShaderInfoLog, get_proc_address);
INIT_FUNC(dispatch, glGetProgramiv, get_proc_address);
INIT_FUNC(dispatch, glGetProgramInfoLog, get_proc_address);
INIT_FUNC(dispatch, glGetUniformLocation, get_proc_address);
return TRUE;
fail:
return FALSE;
}

128
glamor/glamor_gl_dispatch.h
View File

@ -1,128 +0,0 @@
typedef struct glamor_gl_dispatch {
/* Transformation functions */
void (*glMatrixMode) (GLenum mode);
void (*glLoadIdentity) (void);
void (*glViewport) (GLint x, GLint y, GLsizei width, GLsizei height);
/* Drawing functions */
void (*glRasterPos2i) (GLint x, GLint y);
/* Vertex Array */
void (*glDrawArrays) (GLenum mode, GLint first, GLsizei count);
/* Elements Array */
void (*glDrawElements) (GLenum mode, GLsizei count, GLenum type,
const GLvoid * indices);
void (*glDrawRangeElements) (GLenum mode, GLuint start, GLuint end,
GLsizei count, GLenum type,
const GLvoid * indices);
/* Raster functions */
void (*glReadPixels) (GLint x, GLint y,
GLsizei width, GLsizei height,
GLenum format, GLenum type, GLvoid * pixels);
void (*glDrawPixels) (GLsizei width, GLsizei height,
GLenum format, GLenum type, const GLvoid * pixels);
void (*glPixelStorei) (GLenum pname, GLint param);
/* Texture Mapping */
void (*glTexParameteri) (GLenum target, GLenum pname, GLint param);
void (*glTexImage2D) (GLenum target, GLint level,
GLint internalFormat,
GLsizei width, GLsizei height,
GLint border, GLenum format, GLenum type,
const GLvoid * pixels);
/* 1.1 */
void (*glGenTextures) (GLsizei n, GLuint * textures);
void (*glDeleteTextures) (GLsizei n, const GLuint * textures);
void (*glBindTexture) (GLenum target, GLuint texture);
void (*glTexSubImage2D) (GLenum target, GLint level,
GLint xoffset, GLint yoffset,
GLsizei width, GLsizei height,
GLenum format, GLenum type, const GLvoid * pixels);
/* MISC */
void (*glFlush) (void);
void (*glFinish) (void);
void (*glGetIntegerv) (GLenum pname, GLint * params);
const GLubyte *(*glGetString) (GLenum name);
void (*glScissor) (GLint x, GLint y, GLsizei width, GLsizei height);
void (*glEnable) (GLenum cap);
void (*glDisable) (GLenum cap);
void (*glBlendFunc) (GLenum sfactor, GLenum dfactor);
void (*glLogicOp) (GLenum opcode);
/* 1.3 */
void (*glActiveTexture) (GLenum texture);
/* GL Extentions */
void (*glGenBuffers) (GLsizei n, GLuint * buffers);
void (*glBufferData) (GLenum target, GLsizeiptr size,
const GLvoid * data, GLenum usage);
GLvoid *(*glMapBuffer) (GLenum target, GLenum access);
GLvoid *(*glMapBufferRange) (GLenum target, GLintptr offset,
GLsizeiptr length, GLbitfield access);
GLboolean(*glUnmapBuffer) (GLenum target);
void (*glBindBuffer) (GLenum target, GLuint buffer);
void (*glDeleteBuffers) (GLsizei n, const GLuint * buffers);
void (*glFramebufferTexture2D) (GLenum target, GLenum attachment,
GLenum textarget, GLuint texture,
GLint level);
void (*glBindFramebuffer) (GLenum target, GLuint framebuffer);
void (*glDeleteFramebuffers) (GLsizei n, const GLuint * framebuffers);
void (*glGenFramebuffers) (GLsizei n, GLuint * framebuffers);
GLenum(*glCheckFramebufferStatus) (GLenum target);
void (*glBlitFramebuffer) (GLint srcX0, GLint srcY0, GLint srcX1,
GLint srcY1, GLint dstX0, GLint dstY0,
GLint dstX1, GLint dstY1,
GLbitfield mask, GLenum filter);
void (*glVertexAttribPointer) (GLuint index, GLint size,
GLenum type, GLboolean normalized,
GLsizei stride, const GLvoid * pointer);
void (*glDisableVertexAttribArray) (GLuint index);
void (*glEnableVertexAttribArray) (GLuint index);
void (*glBindAttribLocation) (GLuint program, GLuint index,
const GLchar * name);
void (*glLinkProgram) (GLuint program);
void (*glShaderSource) (GLuint shader, GLsizei count,
const GLchar * *string, const GLint * length);
void (*glUseProgram) (GLuint program);
void (*glUniform1i) (GLint location, GLint v0);
void (*glUniform1f) (GLint location, GLfloat v0);
void (*glUniform4f) (GLint location, GLfloat v0, GLfloat v1,
GLfloat v2, GLfloat v3);
void (*glUniform1fv) (GLint location, GLsizei count, const GLfloat * value);
void (*glUniform2fv) (GLint location, GLsizei count, const GLfloat * value);
void (*glUniform4fv) (GLint location, GLsizei count, const GLfloat * value);
void (*glUniformMatrix3fv) (GLint location, GLsizei count,
GLboolean transpose, const GLfloat * value);
GLuint(*glCreateProgram) (void);
GLuint(*glDeleteProgram) (GLuint);
GLuint(*glCreateShader) (GLenum type);
void (*glCompileShader) (GLuint shader);
void (*glAttachShader) (GLuint program, GLuint shader);
void (*glDeleteShader) (GLuint shader);
void (*glGetShaderiv) (GLuint shader, GLenum pname, GLint * params);
void (*glGetShaderInfoLog) (GLuint shader, GLsizei bufSize,
GLsizei * length, GLchar * infoLog);
void (*glGetProgramiv) (GLuint program, GLenum pname, GLint * params);
void (*glGetProgramInfoLog) (GLuint program, GLsizei bufSize,
GLsizei * length, GLchar * infoLog);
GLint(*glGetUniformLocation) (GLuint program, const GLchar * name);
} glamor_gl_dispatch;
typedef void *(*get_proc_address_t) (const char *);
_X_EXPORT Bool
glamor_gl_dispatch_init_impl(struct glamor_gl_dispatch *dispatch,
int gl_version,
get_proc_address_t get_proc_address);
_X_EXPORT Bool
glamor_gl_dispatch_init(ScreenPtr screen,
struct glamor_gl_dispatch *dispatch, int gl_version);

63
glamor/glamor_glext.h
View File

@ -1,63 +0,0 @@
/*
* Copyright © 2001 Keith Packard
* Copyright © 2008 Intel Corporation
*
* Permission is hereby granted, free of charge, to any person obtaining a
* copy of this software and associated documentation files (the "Software"),
* to deal in the Software without restriction, including without limitation
* the rights to use, copy, modify, merge, publish, distribute, sublicense,
* and/or sell copies of the Software, and to permit persons to whom the
* Software is furnished to do so, subject to the following conditions:
*
* The above copyright notice and this permission notice (including the next
* paragraph) shall be included in all copies or substantial portions of the
* Software.
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
* THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
* FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
* IN THE SOFTWARE.
*
* Authors:
* Zhigang Gong <zhigang.gong@linux.intel.com>
*
*/
#ifdef GLAMOR_GLES2
#define GL_BGRA GL_BGRA_EXT
#define GL_COLOR_INDEX 0x1900
#define GL_BITMAP 0x1A00
#define GL_UNSIGNED_INT_8_8_8_8 0x8035
#define GL_UNSIGNED_INT_8_8_8_8_REV 0x8367
#define GL_UNSIGNED_INT_2_10_10_10_REV 0x8368
#define GL_UNSIGNED_INT_10_10_10_2 0x8036
#define GL_UNSIGNED_SHORT_5_6_5_REV 0x8364
#define GL_UNSIGNED_SHORT_1_5_5_5_REV 0x8366
#define GL_UNSIGNED_SHORT_4_4_4_4_REV 0x8365
#define GL_PIXEL_PACK_BUFFER 0x88EB
#define GL_PIXEL_UNPACK_BUFFER 0x88EC
#define GL_CLAMP_TO_BORDER 0x812D
#define GL_READ_WRITE 0x88BA
#define GL_READ_ONLY 0x88B8
#define GL_WRITE_ONLY 0x88B9
#define GL_STREAM_DRAW 0x88E0
#define GL_STREAM_READ 0x88E1
#define GL_PACK_ROW_LENGTH 0x0D02
#define GL_UNPACK_ROW_LENGTH 0x0CF2
#define GL_FRAMEBUFFER_INCOMPLETE_DRAW_BUFFER 0x8CDB
#define GL_FRAMEBUFFER_INCOMPLETE_READ_BUFFER 0x8CDC
#define GL_FRAMEBUFFER_INCOMPLETE_MULTISAMPLE 0x8D56
#define GL_PACK_INVERT_MESA 0x8758
#define GL_MAP_UNSYNCHRONIZED_BIT 0x0020
#define GL_MAP_READ_BIT 0x0001
#define GL_MAP_WRITE_BIT 0x0002
#endif

82
glamor/glamor_glx.c Normal file
View File

@ -0,0 +1,82 @@
/*
* Copyright © 2013 Intel Corporation
*
* Permission is hereby granted, free of charge, to any person obtaining a
* copy of this software and associated documentation files (the "Software"),
* to deal in the Software without restriction, including without limitation
* the rights to use, copy, modify, merge, publish, distribute, sublicense,
* and/or sell copies of the Software, and to permit persons to whom the
* Software is furnished to do so, subject to the following conditions:
*
* The above copyright notice and this permission notice (including the next
* paragraph) shall be included in all copies or substantial portions of the
* Software.
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
* THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
* FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
* IN THE SOFTWARE.
*/
#include <epoxy/glx.h>
#include "glamor_context.h"
/**
* @file glamor_glx.c
*
* GLX context management for glamor.
*
* This has to be kept separate from the server sources because of
* Xlib's conflicting definition of CARD32 and similar typedefs.
*/
static void
glamor_glx_get_context(struct glamor_context *glamor_ctx)
{
GLXContext old_ctx;
if (glamor_ctx->get_count++)
return;
old_ctx = glXGetCurrentContext();
if (old_ctx == glamor_ctx->ctx)
return;
glXMakeCurrent(glamor_ctx->display, glamor_ctx->drawable_xid,
glamor_ctx->ctx);
}
static void
glamor_glx_put_context(struct glamor_context *glamor_ctx)
{
if (--glamor_ctx->get_count)
return;
/* We actually reset the context, so that indirect GLX's EGL usage
* won't get confused by ours.
*/
glXMakeCurrent(glamor_ctx->display, None, NULL);
}
Bool
glamor_glx_screen_init(struct glamor_context *glamor_ctx)
{
glamor_ctx->ctx = glXGetCurrentContext();
if (!glamor_ctx->ctx)
return False;
glamor_ctx->display = glXGetCurrentDisplay();
if (!glamor_ctx->display)
return False;
glamor_ctx->drawable_xid = glXGetCurrentDrawable();
glamor_ctx->get_context = glamor_glx_get_context;
glamor_ctx->put_context = glamor_glx_put_context;
return True;
}

8
glamor/glamor_glyphs.c
View File

@ -1274,15 +1274,13 @@ glamor_buffer_glyph(glamor_screen_private *glamor_priv,
if (buffer->source == NULL) if (buffer->source == NULL)
buffer->source = source; buffer->source = source;
if (glyphs_dst_mode == GLYPHS_DST_MODE_VIA_MASK_CACHE) { if (glyphs_dst_mode == GLYPHS_DST_MODE_VIA_MASK_CACHE) {
glamor_gl_dispatch *dispatch;
/* mode 1 means we are using global mask cache, /* mode 1 means we are using global mask cache,
* thus we have to composite from the cache picture * thus we have to composite from the cache picture
* to the cache picture, we need a flush here to make * to the cache picture, we need a flush here to make
* sure latter we get the corret glyphs data.*/ * sure latter we get the corret glyphs data.*/
dispatch = glamor_get_dispatch(glamor_priv); glamor_get_context(glamor_priv);
dispatch->glFlush(); glFlush();
glamor_put_dispatch(glamor_priv); glamor_put_context(glamor_priv);
} }
} }
else { else {

613
glamor/glamor_gradient.c
View File

@ -42,15 +42,13 @@
#ifdef GLAMOR_GRADIENT_SHADER #ifdef GLAMOR_GRADIENT_SHADER
static GLint static const char *
_glamor_create_getcolor_fs_program(ScreenPtr screen, int stops_count, _glamor_create_getcolor_fs_source(ScreenPtr screen, int stops_count,
int use_array) int use_array)
{ {
glamor_screen_private *glamor_priv; glamor_screen_private *glamor_priv;
glamor_gl_dispatch *dispatch;
char *gradient_fs = NULL; char *gradient_fs = NULL;
GLint fs_getcolor_prog;
#define gradient_fs_getcolor\ #define gradient_fs_getcolor\
GLAMOR_DEFAULT_PRECISION\ GLAMOR_DEFAULT_PRECISION\
@ -177,22 +175,16 @@ _glamor_create_getcolor_fs_program(ScreenPtr screen, int stops_count,
"}\n"; "}\n";
glamor_priv = glamor_get_screen_private(screen); glamor_priv = glamor_get_screen_private(screen);
dispatch = glamor_get_dispatch(glamor_priv); glamor_get_context(glamor_priv);
if (use_array) { if (use_array) {
XNFasprintf(&gradient_fs, XNFasprintf(&gradient_fs,
gradient_fs_getcolor, stops_count, stops_count); gradient_fs_getcolor, stops_count, stops_count);
fs_getcolor_prog = return gradient_fs;
glamor_compile_glsl_prog(dispatch, GL_FRAGMENT_SHADER, gradient_fs);
free(gradient_fs);
} }
else { else {
fs_getcolor_prog = return XNFstrdup(gradient_fs_getcolor_no_array);
glamor_compile_glsl_prog(dispatch, GL_FRAGMENT_SHADER,
gradient_fs_getcolor_no_array);
} }
return fs_getcolor_prog;
} }
static void static void
@ -200,12 +192,11 @@ _glamor_create_radial_gradient_program(ScreenPtr screen, int stops_count,
int dyn_gen) int dyn_gen)
{ {
glamor_screen_private *glamor_priv; glamor_screen_private *glamor_priv;
glamor_gl_dispatch *dispatch;
int index; int index;
GLint gradient_prog = 0; GLint gradient_prog = 0;
char *gradient_fs = NULL; char *gradient_fs = NULL;
GLint fs_main_prog, fs_getcolor_prog, vs_prog; GLint fs_prog, vs_prog;
const char *gradient_vs = const char *gradient_vs =
GLAMOR_DEFAULT_PRECISION GLAMOR_DEFAULT_PRECISION
@ -346,7 +337,10 @@ _glamor_create_radial_gradient_program(ScreenPtr screen, int stops_count,
" } else {\n"\ " } else {\n"\
" gl_FragColor = get_color(stop_len);\n"\ " gl_FragColor = get_color(stop_len);\n"\
" }\n"\ " }\n"\
"}\n" "}\n"\
"\n"\
"%s\n" /* fs_getcolor_source */
const char *fs_getcolor_source;
glamor_priv = glamor_get_screen_private(screen); glamor_priv = glamor_get_screen_private(screen);
@ -355,61 +349,42 @@ _glamor_create_radial_gradient_program(ScreenPtr screen, int stops_count,
return; return;
} }
dispatch = glamor_get_dispatch(glamor_priv); glamor_get_context(glamor_priv);
if (dyn_gen && glamor_priv->gradient_prog[SHADER_GRADIENT_RADIAL][2]) { if (dyn_gen && glamor_priv->gradient_prog[SHADER_GRADIENT_RADIAL][2]) {
dispatch->glDeleteShader(glamor_priv-> glDeleteProgram(glamor_priv->gradient_prog[SHADER_GRADIENT_RADIAL][2]);
radial_gradient_shaders
[SHADER_GRADIENT_VS_PROG][2]);
glamor_priv->radial_gradient_shaders[SHADER_GRADIENT_VS_PROG][2] = 0;
dispatch->glDeleteShader(glamor_priv->
radial_gradient_shaders
[SHADER_GRADIENT_FS_MAIN_PROG][2]);
glamor_priv->radial_gradient_shaders[SHADER_GRADIENT_FS_MAIN_PROG][2] =
0;
dispatch->glDeleteShader(glamor_priv->
radial_gradient_shaders
[SHADER_GRADIENT_FS_GETCOLOR_PROG][2]);
glamor_priv->
radial_gradient_shaders[SHADER_GRADIENT_FS_GETCOLOR_PROG][2] = 0;
dispatch->glDeleteProgram(glamor_priv->
gradient_prog[SHADER_GRADIENT_RADIAL][2]);
glamor_priv->gradient_prog[SHADER_GRADIENT_RADIAL][2] = 0; glamor_priv->gradient_prog[SHADER_GRADIENT_RADIAL][2] = 0;
} }
gradient_prog = dispatch->glCreateProgram(); gradient_prog = glCreateProgram();
vs_prog = glamor_compile_glsl_prog(dispatch, GL_VERTEX_SHADER, gradient_vs); vs_prog = glamor_compile_glsl_prog(GL_VERTEX_SHADER, gradient_vs);
fs_getcolor_source =
_glamor_create_getcolor_fs_source(screen, stops_count,
(stops_count > 0));
XNFasprintf(&gradient_fs, XNFasprintf(&gradient_fs,
gradient_radial_fs_template, gradient_radial_fs_template,
PIXMAN_REPEAT_NONE, PIXMAN_REPEAT_NORMAL, PIXMAN_REPEAT_NONE, PIXMAN_REPEAT_NORMAL,
PIXMAN_REPEAT_REFLECT); PIXMAN_REPEAT_REFLECT,
fs_getcolor_source);
fs_main_prog = glamor_compile_glsl_prog(dispatch, fs_prog = glamor_compile_glsl_prog(GL_FRAGMENT_SHADER, gradient_fs);
GL_FRAGMENT_SHADER, gradient_fs);
free(gradient_fs); free(gradient_fs);
fs_getcolor_prog = glAttachShader(gradient_prog, vs_prog);
_glamor_create_getcolor_fs_program(screen, stops_count, glAttachShader(gradient_prog, fs_prog);
(stops_count > 0)); glDeleteShader(vs_prog);
glDeleteShader(fs_prog);
dispatch->glAttachShader(gradient_prog, vs_prog); glBindAttribLocation(gradient_prog, GLAMOR_VERTEX_POS, "v_position");
dispatch->glAttachShader(gradient_prog, fs_getcolor_prog); glBindAttribLocation(gradient_prog, GLAMOR_VERTEX_SOURCE, "v_texcoord");
dispatch->glAttachShader(gradient_prog, fs_main_prog);
dispatch->glBindAttribLocation(gradient_prog, GLAMOR_VERTEX_POS, glamor_link_glsl_prog(gradient_prog);
"v_positionsition");
dispatch->glBindAttribLocation(gradient_prog, GLAMOR_VERTEX_SOURCE,
"v_texcoord");
glamor_link_glsl_prog(dispatch, gradient_prog); glUseProgram(0);
dispatch->glUseProgram(0);
if (dyn_gen) { if (dyn_gen) {
index = 2; index = 2;
@ -423,15 +398,8 @@ _glamor_create_radial_gradient_program(ScreenPtr screen, int stops_count,
} }
glamor_priv->gradient_prog[SHADER_GRADIENT_RADIAL][index] = gradient_prog; glamor_priv->gradient_prog[SHADER_GRADIENT_RADIAL][index] = gradient_prog;
glamor_priv->radial_gradient_shaders[SHADER_GRADIENT_VS_PROG][index] =
vs_prog;
glamor_priv->radial_gradient_shaders[SHADER_GRADIENT_FS_MAIN_PROG][index] =
fs_main_prog;
glamor_priv->
radial_gradient_shaders[SHADER_GRADIENT_FS_GETCOLOR_PROG][index] =
fs_getcolor_prog;
glamor_put_dispatch(glamor_priv); glamor_put_context(glamor_priv);
} }
static void static void
@ -439,12 +407,11 @@ _glamor_create_linear_gradient_program(ScreenPtr screen, int stops_count,
int dyn_gen) int dyn_gen)
{ {
glamor_screen_private *glamor_priv; glamor_screen_private *glamor_priv;
glamor_gl_dispatch *dispatch;
int index = 0; int index = 0;
GLint gradient_prog = 0; GLint gradient_prog = 0;
char *gradient_fs = NULL; char *gradient_fs = NULL;
GLint fs_main_prog, fs_getcolor_prog, vs_prog; GLint fs_prog, vs_prog;
const char *gradient_vs = const char *gradient_vs =
GLAMOR_DEFAULT_PRECISION GLAMOR_DEFAULT_PRECISION
@ -587,7 +554,10 @@ _glamor_create_linear_gradient_program(ScreenPtr screen, int stops_count,
"{\n"\ "{\n"\
" float stop_len = get_stop_len();\n"\ " float stop_len = get_stop_len();\n"\
" gl_FragColor = get_color(stop_len);\n"\ " gl_FragColor = get_color(stop_len);\n"\
"}\n" "}\n"\
"\n"\
"%s" /* fs_getcolor_source */
const char *fs_getcolor_source;
glamor_priv = glamor_get_screen_private(screen); glamor_priv = glamor_get_screen_private(screen);
@ -596,58 +566,38 @@ _glamor_create_linear_gradient_program(ScreenPtr screen, int stops_count,
return; return;
} }
dispatch = glamor_get_dispatch(glamor_priv); glamor_get_context(glamor_priv);
if (dyn_gen && glamor_priv->gradient_prog[SHADER_GRADIENT_LINEAR][2]) { if (dyn_gen && glamor_priv->gradient_prog[SHADER_GRADIENT_LINEAR][2]) {
dispatch->glDeleteShader(glamor_priv-> glDeleteProgram(glamor_priv->gradient_prog[SHADER_GRADIENT_LINEAR][2]);
linear_gradient_shaders
[SHADER_GRADIENT_VS_PROG][2]);
glamor_priv->linear_gradient_shaders[SHADER_GRADIENT_VS_PROG][2] = 0;
dispatch->glDeleteShader(glamor_priv->
linear_gradient_shaders
[SHADER_GRADIENT_FS_MAIN_PROG][2]);
glamor_priv->linear_gradient_shaders[SHADER_GRADIENT_FS_MAIN_PROG][2] =
0;
dispatch->glDeleteShader(glamor_priv->
linear_gradient_shaders
[SHADER_GRADIENT_FS_GETCOLOR_PROG][2]);
glamor_priv->
linear_gradient_shaders[SHADER_GRADIENT_FS_GETCOLOR_PROG][2] = 0;
dispatch->glDeleteProgram(glamor_priv->
gradient_prog[SHADER_GRADIENT_LINEAR][2]);
glamor_priv->gradient_prog[SHADER_GRADIENT_LINEAR][2] = 0; glamor_priv->gradient_prog[SHADER_GRADIENT_LINEAR][2] = 0;
} }
gradient_prog = dispatch->glCreateProgram(); gradient_prog = glCreateProgram();
vs_prog = glamor_compile_glsl_prog(dispatch, GL_VERTEX_SHADER, gradient_vs); vs_prog = glamor_compile_glsl_prog(GL_VERTEX_SHADER, gradient_vs);
fs_getcolor_source =
_glamor_create_getcolor_fs_source(screen, stops_count, stops_count > 0);
XNFasprintf(&gradient_fs, XNFasprintf(&gradient_fs,
gradient_fs_template, gradient_fs_template,
PIXMAN_REPEAT_NORMAL, PIXMAN_REPEAT_REFLECT); PIXMAN_REPEAT_NORMAL, PIXMAN_REPEAT_REFLECT,
fs_getcolor_source);
fs_main_prog = glamor_compile_glsl_prog(dispatch, fs_prog = glamor_compile_glsl_prog(GL_FRAGMENT_SHADER, gradient_fs);
GL_FRAGMENT_SHADER, gradient_fs);
free(gradient_fs); free(gradient_fs);
fs_getcolor_prog = glAttachShader(gradient_prog, vs_prog);
_glamor_create_getcolor_fs_program(screen, stops_count, glAttachShader(gradient_prog, fs_prog);
(stops_count > 0)); glDeleteShader(vs_prog);
glDeleteShader(fs_prog);
dispatch->glAttachShader(gradient_prog, vs_prog); glBindAttribLocation(gradient_prog, GLAMOR_VERTEX_POS, "v_position");
dispatch->glAttachShader(gradient_prog, fs_getcolor_prog); glBindAttribLocation(gradient_prog, GLAMOR_VERTEX_SOURCE, "v_texcoord");
dispatch->glAttachShader(gradient_prog, fs_main_prog);
dispatch->glBindAttribLocation(gradient_prog, GLAMOR_VERTEX_POS, glamor_link_glsl_prog(gradient_prog);
"v_position");
dispatch->glBindAttribLocation(gradient_prog, GLAMOR_VERTEX_SOURCE,
"v_texcoord");
glamor_link_glsl_prog(dispatch, gradient_prog); glUseProgram(0);
dispatch->glUseProgram(0);
if (dyn_gen) { if (dyn_gen) {
index = 2; index = 2;
@ -661,15 +611,8 @@ _glamor_create_linear_gradient_program(ScreenPtr screen, int stops_count,
} }
glamor_priv->gradient_prog[SHADER_GRADIENT_LINEAR][index] = gradient_prog; glamor_priv->gradient_prog[SHADER_GRADIENT_LINEAR][index] = gradient_prog;
glamor_priv->linear_gradient_shaders[SHADER_GRADIENT_VS_PROG][index] =
vs_prog;
glamor_priv->linear_gradient_shaders[SHADER_GRADIENT_FS_MAIN_PROG][index] =
fs_main_prog;
glamor_priv->
linear_gradient_shaders[SHADER_GRADIENT_FS_GETCOLOR_PROG][index] =
fs_getcolor_prog;
glamor_put_dispatch(glamor_priv); glamor_put_context(glamor_priv);
} }
void void
@ -682,18 +625,7 @@ glamor_init_gradient_shader(ScreenPtr screen)
for (i = 0; i < 3; i++) { for (i = 0; i < 3; i++) {
glamor_priv->gradient_prog[SHADER_GRADIENT_LINEAR][i] = 0; glamor_priv->gradient_prog[SHADER_GRADIENT_LINEAR][i] = 0;
glamor_priv->linear_gradient_shaders[SHADER_GRADIENT_VS_PROG][i] = 0;
glamor_priv->linear_gradient_shaders[SHADER_GRADIENT_FS_MAIN_PROG][i] =
0;
glamor_priv->
linear_gradient_shaders[SHADER_GRADIENT_FS_GETCOLOR_PROG][i] = 0;
glamor_priv->gradient_prog[SHADER_GRADIENT_RADIAL][i] = 0; glamor_priv->gradient_prog[SHADER_GRADIENT_RADIAL][i] = 0;
glamor_priv->radial_gradient_shaders[SHADER_GRADIENT_VS_PROG][i] = 0;
glamor_priv->radial_gradient_shaders[SHADER_GRADIENT_FS_MAIN_PROG][i] =
0;
glamor_priv->
radial_gradient_shaders[SHADER_GRADIENT_FS_GETCOLOR_PROG][i] = 0;
} }
glamor_priv->linear_max_nstops = 0; glamor_priv->linear_max_nstops = 0;
glamor_priv->radial_max_nstops = 0; glamor_priv->radial_max_nstops = 0;
@ -709,59 +641,23 @@ void
glamor_fini_gradient_shader(ScreenPtr screen) glamor_fini_gradient_shader(ScreenPtr screen)
{ {
glamor_screen_private *glamor_priv; glamor_screen_private *glamor_priv;
glamor_gl_dispatch *dispatch;
int i = 0; int i = 0;
glamor_priv = glamor_get_screen_private(screen); glamor_priv = glamor_get_screen_private(screen);
dispatch = glamor_get_dispatch(glamor_priv); glamor_get_context(glamor_priv);
for (i = 0; i < 3; i++) { for (i = 0; i < 3; i++) {
/* Linear Gradient */ /* Linear Gradient */
if (glamor_priv->linear_gradient_shaders[SHADER_GRADIENT_VS_PROG][i])
dispatch->glDeleteShader(glamor_priv->
linear_gradient_shaders
[SHADER_GRADIENT_VS_PROG][i]);
if (glamor_priv->
linear_gradient_shaders[SHADER_GRADIENT_FS_MAIN_PROG][i])
dispatch->glDeleteShader(glamor_priv->
linear_gradient_shaders
[SHADER_GRADIENT_FS_MAIN_PROG][i]);
if (glamor_priv->
linear_gradient_shaders[SHADER_GRADIENT_FS_GETCOLOR_PROG][i])
dispatch->glDeleteShader(glamor_priv->
linear_gradient_shaders
[SHADER_GRADIENT_FS_GETCOLOR_PROG][i]);
if (glamor_priv->gradient_prog[SHADER_GRADIENT_LINEAR][i]) if (glamor_priv->gradient_prog[SHADER_GRADIENT_LINEAR][i])
dispatch->glDeleteProgram(glamor_priv-> glDeleteProgram(glamor_priv->gradient_prog
gradient_prog[SHADER_GRADIENT_LINEAR][i]); [SHADER_GRADIENT_LINEAR][i]);
/* Radial Gradient */
if (glamor_priv->radial_gradient_shaders[SHADER_GRADIENT_VS_PROG][i])
dispatch->glDeleteShader(glamor_priv->
radial_gradient_shaders
[SHADER_GRADIENT_VS_PROG][i]);
if (glamor_priv->
radial_gradient_shaders[SHADER_GRADIENT_FS_MAIN_PROG][i])
dispatch->glDeleteShader(glamor_priv->
radial_gradient_shaders
[SHADER_GRADIENT_FS_MAIN_PROG][i]);
if (glamor_priv->
radial_gradient_shaders[SHADER_GRADIENT_FS_GETCOLOR_PROG][i])
dispatch->glDeleteShader(glamor_priv->
radial_gradient_shaders
[SHADER_GRADIENT_FS_GETCOLOR_PROG][i]);
if (glamor_priv->gradient_prog[SHADER_GRADIENT_RADIAL][i]) if (glamor_priv->gradient_prog[SHADER_GRADIENT_RADIAL][i])
dispatch->glDeleteProgram(glamor_priv-> glDeleteProgram(glamor_priv->gradient_prog
gradient_prog[SHADER_GRADIENT_RADIAL][i]); [SHADER_GRADIENT_RADIAL][i]);
} }
glamor_put_dispatch(glamor_priv); glamor_put_context(glamor_priv);
} }
static void static void
@ -835,7 +731,6 @@ _glamor_gradient_set_pixmap_destination(ScreenPtr screen,
{ {
glamor_pixmap_private *pixmap_priv; glamor_pixmap_private *pixmap_priv;
PixmapPtr pixmap = NULL; PixmapPtr pixmap = NULL;
glamor_gl_dispatch *dispatch = NULL;
pixmap = glamor_get_drawable_pixmap(dst_picture->pDrawable); pixmap = glamor_get_drawable_pixmap(dst_picture->pDrawable);
pixmap_priv = glamor_get_pixmap_private(pixmap); pixmap_priv = glamor_get_pixmap_private(pixmap);
@ -893,17 +788,17 @@ _glamor_gradient_set_pixmap_destination(ScreenPtr screen,
tex_vertices[0], tex_vertices[1], tex_vertices[2], tex_vertices[3], tex_vertices[0], tex_vertices[1], tex_vertices[2], tex_vertices[3],
tex_vertices[4], tex_vertices[5], tex_vertices[6], tex_vertices[7]); tex_vertices[4], tex_vertices[5], tex_vertices[6], tex_vertices[7]);
dispatch = glamor_get_dispatch(glamor_priv); glamor_get_context(glamor_priv);
dispatch->glVertexAttribPointer(GLAMOR_VERTEX_POS, 2, GL_FLOAT, glVertexAttribPointer(GLAMOR_VERTEX_POS, 2, GL_FLOAT,
GL_FALSE, 0, vertices); GL_FALSE, 0, vertices);
dispatch->glVertexAttribPointer(GLAMOR_VERTEX_SOURCE, 2, GL_FLOAT, glVertexAttribPointer(GLAMOR_VERTEX_SOURCE, 2, GL_FLOAT,
GL_FALSE, 0, tex_vertices); GL_FALSE, 0, tex_vertices);
dispatch->glEnableVertexAttribArray(GLAMOR_VERTEX_POS); glEnableVertexAttribArray(GLAMOR_VERTEX_POS);
dispatch->glEnableVertexAttribArray(GLAMOR_VERTEX_SOURCE); glEnableVertexAttribArray(GLAMOR_VERTEX_SOURCE);
glamor_put_dispatch(glamor_priv); glamor_put_context(glamor_priv);
return 1; return 1;
} }
@ -996,7 +891,6 @@ glamor_generate_radial_gradient_picture(ScreenPtr screen,
PictFormatShort format) PictFormatShort format)
{ {
glamor_screen_private *glamor_priv; glamor_screen_private *glamor_priv;
glamor_gl_dispatch *dispatch;
PicturePtr dst_picture = NULL; PicturePtr dst_picture = NULL;
PixmapPtr pixmap = NULL; PixmapPtr pixmap = NULL;
GLint gradient_prog = 0; GLint gradient_prog = 0;
@ -1047,7 +941,7 @@ glamor_generate_radial_gradient_picture(ScreenPtr screen,
GLint r2_uniform_location = 0; GLint r2_uniform_location = 0;
glamor_priv = glamor_get_screen_private(screen); glamor_priv = glamor_get_screen_private(screen);
dispatch = glamor_get_dispatch(glamor_priv); glamor_get_context(glamor_priv);
/* Create a pixmap with VBO. */ /* Create a pixmap with VBO. */
pixmap = glamor_create_pixmap(screen, pixmap = glamor_create_pixmap(screen,
@ -1088,77 +982,74 @@ glamor_generate_radial_gradient_picture(ScreenPtr screen,
} }
/* Bind all the uniform vars . */ /* Bind all the uniform vars . */
transform_mat_uniform_location = transform_mat_uniform_location = glGetUniformLocation(gradient_prog,
dispatch->glGetUniformLocation(gradient_prog, "transform_mat"); "transform_mat");
repeat_type_uniform_location = repeat_type_uniform_location = glGetUniformLocation(gradient_prog,
dispatch->glGetUniformLocation(gradient_prog, "repeat_type"); "repeat_type");
n_stop_uniform_location = n_stop_uniform_location = glGetUniformLocation(gradient_prog, "n_stop");
dispatch->glGetUniformLocation(gradient_prog, "n_stop"); A_value_uniform_location = glGetUniformLocation(gradient_prog, "A_value");
A_value_uniform_location = repeat_type_uniform_location =glGetUniformLocation(gradient_prog,
dispatch->glGetUniformLocation(gradient_prog, "A_value"); "repeat_type");
repeat_type_uniform_location = c1_uniform_location = glGetUniformLocation(gradient_prog, "c1");
dispatch->glGetUniformLocation(gradient_prog, "repeat_type"); r1_uniform_location = glGetUniformLocation(gradient_prog, "r1");
c1_uniform_location = dispatch->glGetUniformLocation(gradient_prog, "c1"); c2_uniform_location = glGetUniformLocation(gradient_prog, "c2");
r1_uniform_location = dispatch->glGetUniformLocation(gradient_prog, "r1"); r2_uniform_location = glGetUniformLocation(gradient_prog, "r2");
c2_uniform_location = dispatch->glGetUniformLocation(gradient_prog, "c2");
r2_uniform_location = dispatch->glGetUniformLocation(gradient_prog, "r2");
if (src_picture->pSourcePict->radial.nstops + 2 <= RADIAL_SMALL_STOPS) { if (src_picture->pSourcePict->radial.nstops + 2 <= RADIAL_SMALL_STOPS) {
stop0_uniform_location = stop0_uniform_location =
dispatch->glGetUniformLocation(gradient_prog, "stop0"); glGetUniformLocation(gradient_prog, "stop0");
stop1_uniform_location = stop1_uniform_location =
dispatch->glGetUniformLocation(gradient_prog, "stop1"); glGetUniformLocation(gradient_prog, "stop1");
stop2_uniform_location = stop2_uniform_location =
dispatch->glGetUniformLocation(gradient_prog, "stop2"); glGetUniformLocation(gradient_prog, "stop2");
stop3_uniform_location = stop3_uniform_location =
dispatch->glGetUniformLocation(gradient_prog, "stop3"); glGetUniformLocation(gradient_prog, "stop3");
stop4_uniform_location = stop4_uniform_location =
dispatch->glGetUniformLocation(gradient_prog, "stop4"); glGetUniformLocation(gradient_prog, "stop4");
stop5_uniform_location = stop5_uniform_location =
dispatch->glGetUniformLocation(gradient_prog, "stop5"); glGetUniformLocation(gradient_prog, "stop5");
stop6_uniform_location = stop6_uniform_location =
dispatch->glGetUniformLocation(gradient_prog, "stop6"); glGetUniformLocation(gradient_prog, "stop6");
stop7_uniform_location = stop7_uniform_location =
dispatch->glGetUniformLocation(gradient_prog, "stop7"); glGetUniformLocation(gradient_prog, "stop7");
stop_color0_uniform_location = stop_color0_uniform_location =
dispatch->glGetUniformLocation(gradient_prog, "stop_color0"); glGetUniformLocation(gradient_prog, "stop_color0");
stop_color1_uniform_location = stop_color1_uniform_location =
dispatch->glGetUniformLocation(gradient_prog, "stop_color1"); glGetUniformLocation(gradient_prog, "stop_color1");
stop_color2_uniform_location = stop_color2_uniform_location =
dispatch->glGetUniformLocation(gradient_prog, "stop_color2"); glGetUniformLocation(gradient_prog, "stop_color2");
stop_color3_uniform_location = stop_color3_uniform_location =
dispatch->glGetUniformLocation(gradient_prog, "stop_color3"); glGetUniformLocation(gradient_prog, "stop_color3");
stop_color4_uniform_location = stop_color4_uniform_location =
dispatch->glGetUniformLocation(gradient_prog, "stop_color4"); glGetUniformLocation(gradient_prog, "stop_color4");
stop_color5_uniform_location = stop_color5_uniform_location =
dispatch->glGetUniformLocation(gradient_prog, "stop_color5"); glGetUniformLocation(gradient_prog, "stop_color5");
stop_color6_uniform_location = stop_color6_uniform_location =
dispatch->glGetUniformLocation(gradient_prog, "stop_color6"); glGetUniformLocation(gradient_prog, "stop_color6");
stop_color7_uniform_location = stop_color7_uniform_location =
dispatch->glGetUniformLocation(gradient_prog, "stop_color7"); glGetUniformLocation(gradient_prog, "stop_color7");
} }
else { else {
stops_uniform_location = stops_uniform_location =
dispatch->glGetUniformLocation(gradient_prog, "stops"); glGetUniformLocation(gradient_prog, "stops");
stop_colors_uniform_location = stop_colors_uniform_location =
dispatch->glGetUniformLocation(gradient_prog, "stop_colors"); glGetUniformLocation(gradient_prog, "stop_colors");
} }
dispatch->glUseProgram(gradient_prog); glUseProgram(gradient_prog);
dispatch->glUniform1i(repeat_type_uniform_location, glUniform1i(repeat_type_uniform_location, src_picture->repeatType);
src_picture->repeatType);
if (src_picture->transform) { if (src_picture->transform) {
_glamor_gradient_convert_trans_matrix(src_picture->transform, _glamor_gradient_convert_trans_matrix(src_picture->transform,
transform_mat, width, height, 0); transform_mat, width, height, 0);
dispatch->glUniformMatrix3fv(transform_mat_uniform_location, glUniformMatrix3fv(transform_mat_uniform_location,
1, 1, &transform_mat[0][0]); 1, 1, &transform_mat[0][0]);
} }
else { else {
dispatch->glUniformMatrix3fv(transform_mat_uniform_location, glUniformMatrix3fv(transform_mat_uniform_location,
1, 1, &identity_mat[0][0]); 1, 1, &identity_mat[0][0]);
} }
if (!_glamor_gradient_set_pixmap_destination if (!_glamor_gradient_set_pixmap_destination
@ -1193,54 +1084,53 @@ glamor_generate_radial_gradient_picture(ScreenPtr screen,
if (src_picture->pSourcePict->linear.nstops + 2 <= RADIAL_SMALL_STOPS) { if (src_picture->pSourcePict->linear.nstops + 2 <= RADIAL_SMALL_STOPS) {
int j = 0; int j = 0;
dispatch->glUniform4f(stop_color0_uniform_location, glUniform4f(stop_color0_uniform_location,
stop_colors[4 * j + 0], stop_colors[4 * j + 1], stop_colors[4 * j + 0], stop_colors[4 * j + 1],
stop_colors[4 * j + 2], stop_colors[4 * j + 3]); stop_colors[4 * j + 2], stop_colors[4 * j + 3]);
j++; j++;
dispatch->glUniform4f(stop_color1_uniform_location, glUniform4f(stop_color1_uniform_location,
stop_colors[4 * j + 0], stop_colors[4 * j + 1], stop_colors[4 * j + 0], stop_colors[4 * j + 1],
stop_colors[4 * j + 2], stop_colors[4 * j + 3]); stop_colors[4 * j + 2], stop_colors[4 * j + 3]);
j++; j++;
dispatch->glUniform4f(stop_color2_uniform_location, glUniform4f(stop_color2_uniform_location,
stop_colors[4 * j + 0], stop_colors[4 * j + 1], stop_colors[4 * j + 0], stop_colors[4 * j + 1],
stop_colors[4 * j + 2], stop_colors[4 * j + 3]); stop_colors[4 * j + 2], stop_colors[4 * j + 3]);
j++; j++;
dispatch->glUniform4f(stop_color3_uniform_location, glUniform4f(stop_color3_uniform_location,
stop_colors[4 * j + 0], stop_colors[4 * j + 1], stop_colors[4 * j + 0], stop_colors[4 * j + 1],
stop_colors[4 * j + 2], stop_colors[4 * j + 3]); stop_colors[4 * j + 2], stop_colors[4 * j + 3]);
j++; j++;
dispatch->glUniform4f(stop_color4_uniform_location, glUniform4f(stop_color4_uniform_location,
stop_colors[4 * j + 0], stop_colors[4 * j + 1], stop_colors[4 * j + 0], stop_colors[4 * j + 1],
stop_colors[4 * j + 2], stop_colors[4 * j + 3]); stop_colors[4 * j + 2], stop_colors[4 * j + 3]);
j++; j++;
dispatch->glUniform4f(stop_color5_uniform_location, glUniform4f(stop_color5_uniform_location,
stop_colors[4 * j + 0], stop_colors[4 * j + 1], stop_colors[4 * j + 0], stop_colors[4 * j + 1],
stop_colors[4 * j + 2], stop_colors[4 * j + 3]); stop_colors[4 * j + 2], stop_colors[4 * j + 3]);
j++; j++;
dispatch->glUniform4f(stop_color6_uniform_location, glUniform4f(stop_color6_uniform_location,
stop_colors[4 * j + 0], stop_colors[4 * j + 1], stop_colors[4 * j + 0], stop_colors[4 * j + 1],
stop_colors[4 * j + 2], stop_colors[4 * j + 3]); stop_colors[4 * j + 2], stop_colors[4 * j + 3]);
j++; j++;
dispatch->glUniform4f(stop_color7_uniform_location, glUniform4f(stop_color7_uniform_location,
stop_colors[4 * j + 0], stop_colors[4 * j + 1], stop_colors[4 * j + 0], stop_colors[4 * j + 1],
stop_colors[4 * j + 2], stop_colors[4 * j + 3]); stop_colors[4 * j + 2], stop_colors[4 * j + 3]);
j = 0; j = 0;
dispatch->glUniform1f(stop0_uniform_location, n_stops[j++]); glUniform1f(stop0_uniform_location, n_stops[j++]);
dispatch->glUniform1f(stop1_uniform_location, n_stops[j++]); glUniform1f(stop1_uniform_location, n_stops[j++]);
dispatch->glUniform1f(stop2_uniform_location, n_stops[j++]); glUniform1f(stop2_uniform_location, n_stops[j++]);
dispatch->glUniform1f(stop3_uniform_location, n_stops[j++]); glUniform1f(stop3_uniform_location, n_stops[j++]);
dispatch->glUniform1f(stop4_uniform_location, n_stops[j++]); glUniform1f(stop4_uniform_location, n_stops[j++]);
dispatch->glUniform1f(stop5_uniform_location, n_stops[j++]); glUniform1f(stop5_uniform_location, n_stops[j++]);
dispatch->glUniform1f(stop6_uniform_location, n_stops[j++]); glUniform1f(stop6_uniform_location, n_stops[j++]);
dispatch->glUniform1f(stop7_uniform_location, n_stops[j++]); glUniform1f(stop7_uniform_location, n_stops[j++]);
dispatch->glUniform1i(n_stop_uniform_location, count); glUniform1i(n_stop_uniform_location, count);
} }
else { else {
dispatch->glUniform4fv(stop_colors_uniform_location, count, glUniform4fv(stop_colors_uniform_location, count, stop_colors);
stop_colors); glUniform1fv(stops_uniform_location, count, n_stops);
dispatch->glUniform1fv(stops_uniform_location, count, n_stops); glUniform1i(n_stop_uniform_location, count);
dispatch->glUniform1i(n_stop_uniform_location, count);
} }
c1x = (float) pixman_fixed_to_double(src_picture->pSourcePict->radial.c1.x); c1x = (float) pixman_fixed_to_double(src_picture->pSourcePict->radial.c1.x);
@ -1255,25 +1145,25 @@ glamor_generate_radial_gradient_picture(ScreenPtr screen,
glamor_set_circle_centre(width, height, c1x, c1y, glamor_priv->yInverted, glamor_set_circle_centre(width, height, c1x, c1y, glamor_priv->yInverted,
cxy); cxy);
dispatch->glUniform2fv(c1_uniform_location, 1, cxy); glUniform2fv(c1_uniform_location, 1, cxy);
dispatch->glUniform1f(r1_uniform_location, r1); glUniform1f(r1_uniform_location, r1);
glamor_set_circle_centre(width, height, c2x, c2y, glamor_priv->yInverted, glamor_set_circle_centre(width, height, c2x, c2y, glamor_priv->yInverted,
cxy); cxy);
dispatch->glUniform2fv(c2_uniform_location, 1, cxy); glUniform2fv(c2_uniform_location, 1, cxy);
dispatch->glUniform1f(r2_uniform_location, r2); glUniform1f(r2_uniform_location, r2);
A_value = A_value =
(c2x - c1x) * (c2x - c1x) + (c2y - c1y) * (c2y - c1y) - (r2 - (c2x - c1x) * (c2x - c1x) + (c2y - c1y) * (c2y - c1y) - (r2 -
r1) * (r2 - r1) * (r2 -
r1); r1);
dispatch->glUniform1f(A_value_uniform_location, A_value); glUniform1f(A_value_uniform_location, A_value);
DEBUGF("C1:(%f, %f) R1:%f\nC2:(%f, %f) R2:%f\nA = %f\n", DEBUGF("C1:(%f, %f) R1:%f\nC2:(%f, %f) R2:%f\nA = %f\n",
c1x, c1y, r1, c2x, c2y, r2, A_value); c1x, c1y, r1, c2x, c2y, r2, A_value);
/* Now rendering. */ /* Now rendering. */
dispatch->glDrawArrays(GL_TRIANGLE_STRIP, 0, 4); glDrawArrays(GL_TRIANGLE_STRIP, 0, 4);
/* Do the clear logic. */ /* Do the clear logic. */
if (stops_count > RADIAL_SMALL_STOPS) { if (stops_count > RADIAL_SMALL_STOPS) {
@ -1281,14 +1171,14 @@ glamor_generate_radial_gradient_picture(ScreenPtr screen,
free(stop_colors); free(stop_colors);
} }
dispatch->glBindBuffer(GL_ARRAY_BUFFER, 0); glBindBuffer(GL_ARRAY_BUFFER, 0);
dispatch->glBindBuffer(GL_ELEMENT_ARRAY_BUFFER, 0); glBindBuffer(GL_ELEMENT_ARRAY_BUFFER, 0);
dispatch->glDisableVertexAttribArray(GLAMOR_VERTEX_POS); glDisableVertexAttribArray(GLAMOR_VERTEX_POS);
dispatch->glDisableVertexAttribArray(GLAMOR_VERTEX_SOURCE); glDisableVertexAttribArray(GLAMOR_VERTEX_SOURCE);
dispatch->glUseProgram(0); glUseProgram(0);
glamor_put_dispatch(glamor_priv); glamor_put_context(glamor_priv);
return dst_picture; return dst_picture;
GRADIENT_FAIL: GRADIENT_FAIL:
@ -1303,13 +1193,13 @@ glamor_generate_radial_gradient_picture(ScreenPtr screen,
free(stop_colors); free(stop_colors);
} }
dispatch->glBindBuffer(GL_ARRAY_BUFFER, 0); glBindBuffer(GL_ARRAY_BUFFER, 0);
dispatch->glBindBuffer(GL_ELEMENT_ARRAY_BUFFER, 0); glBindBuffer(GL_ELEMENT_ARRAY_BUFFER, 0);
dispatch->glDisableVertexAttribArray(GLAMOR_VERTEX_POS); glDisableVertexAttribArray(GLAMOR_VERTEX_POS);
dispatch->glDisableVertexAttribArray(GLAMOR_VERTEX_SOURCE); glDisableVertexAttribArray(GLAMOR_VERTEX_SOURCE);
dispatch->glUseProgram(0); glUseProgram(0);
glamor_put_dispatch(glamor_priv); glamor_put_context(glamor_priv);
return NULL; return NULL;
} }
@ -1321,7 +1211,6 @@ glamor_generate_linear_gradient_picture(ScreenPtr screen,
PictFormatShort format) PictFormatShort format)
{ {
glamor_screen_private *glamor_priv; glamor_screen_private *glamor_priv;
glamor_gl_dispatch *dispatch;
PicturePtr dst_picture = NULL; PicturePtr dst_picture = NULL;
PixmapPtr pixmap = NULL; PixmapPtr pixmap = NULL;
GLint gradient_prog = 0; GLint gradient_prog = 0;
@ -1374,7 +1263,7 @@ glamor_generate_linear_gradient_picture(ScreenPtr screen,
GLint pt_distance_uniform_location = 0; GLint pt_distance_uniform_location = 0;
glamor_priv = glamor_get_screen_private(screen); glamor_priv = glamor_get_screen_private(screen);
dispatch = glamor_get_dispatch(glamor_priv); glamor_get_context(glamor_priv);
/* Create a pixmap with VBO. */ /* Create a pixmap with VBO. */
pixmap = glamor_create_pixmap(screen, pixmap = glamor_create_pixmap(screen,
@ -1417,79 +1306,78 @@ glamor_generate_linear_gradient_picture(ScreenPtr screen,
/* Bind all the uniform vars . */ /* Bind all the uniform vars . */
n_stop_uniform_location = n_stop_uniform_location =
dispatch->glGetUniformLocation(gradient_prog, "n_stop"); glGetUniformLocation(gradient_prog, "n_stop");
pt_slope_uniform_location = pt_slope_uniform_location =
dispatch->glGetUniformLocation(gradient_prog, "pt_slope"); glGetUniformLocation(gradient_prog, "pt_slope");
repeat_type_uniform_location = repeat_type_uniform_location =
dispatch->glGetUniformLocation(gradient_prog, "repeat_type"); glGetUniformLocation(gradient_prog, "repeat_type");
hor_ver_uniform_location = hor_ver_uniform_location =
dispatch->glGetUniformLocation(gradient_prog, "hor_ver"); glGetUniformLocation(gradient_prog, "hor_ver");
transform_mat_uniform_location = transform_mat_uniform_location =
dispatch->glGetUniformLocation(gradient_prog, "transform_mat"); glGetUniformLocation(gradient_prog, "transform_mat");
cos_val_uniform_location = cos_val_uniform_location =
dispatch->glGetUniformLocation(gradient_prog, "cos_val"); glGetUniformLocation(gradient_prog, "cos_val");
p1_distance_uniform_location = p1_distance_uniform_location =
dispatch->glGetUniformLocation(gradient_prog, "p1_distance"); glGetUniformLocation(gradient_prog, "p1_distance");
pt_distance_uniform_location = pt_distance_uniform_location =
dispatch->glGetUniformLocation(gradient_prog, "pt_distance"); glGetUniformLocation(gradient_prog, "pt_distance");
if (src_picture->pSourcePict->linear.nstops + 2 <= LINEAR_SMALL_STOPS) { if (src_picture->pSourcePict->linear.nstops + 2 <= LINEAR_SMALL_STOPS) {
stop0_uniform_location = stop0_uniform_location =
dispatch->glGetUniformLocation(gradient_prog, "stop0"); glGetUniformLocation(gradient_prog, "stop0");
stop1_uniform_location = stop1_uniform_location =
dispatch->glGetUniformLocation(gradient_prog, "stop1"); glGetUniformLocation(gradient_prog, "stop1");
stop2_uniform_location = stop2_uniform_location =
dispatch->glGetUniformLocation(gradient_prog, "stop2"); glGetUniformLocation(gradient_prog, "stop2");
stop3_uniform_location = stop3_uniform_location =
dispatch->glGetUniformLocation(gradient_prog, "stop3"); glGetUniformLocation(gradient_prog, "stop3");
stop4_uniform_location = stop4_uniform_location =
dispatch->glGetUniformLocation(gradient_prog, "stop4"); glGetUniformLocation(gradient_prog, "stop4");
stop5_uniform_location = stop5_uniform_location =
dispatch->glGetUniformLocation(gradient_prog, "stop5"); glGetUniformLocation(gradient_prog, "stop5");
stop6_uniform_location = stop6_uniform_location =
dispatch->glGetUniformLocation(gradient_prog, "stop6"); glGetUniformLocation(gradient_prog, "stop6");
stop7_uniform_location = stop7_uniform_location =
dispatch->glGetUniformLocation(gradient_prog, "stop7"); glGetUniformLocation(gradient_prog, "stop7");
stop_color0_uniform_location = stop_color0_uniform_location =
dispatch->glGetUniformLocation(gradient_prog, "stop_color0"); glGetUniformLocation(gradient_prog, "stop_color0");
stop_color1_uniform_location = stop_color1_uniform_location =
dispatch->glGetUniformLocation(gradient_prog, "stop_color1"); glGetUniformLocation(gradient_prog, "stop_color1");
stop_color2_uniform_location = stop_color2_uniform_location =
dispatch->glGetUniformLocation(gradient_prog, "stop_color2"); glGetUniformLocation(gradient_prog, "stop_color2");
stop_color3_uniform_location = stop_color3_uniform_location =
dispatch->glGetUniformLocation(gradient_prog, "stop_color3"); glGetUniformLocation(gradient_prog, "stop_color3");
stop_color4_uniform_location = stop_color4_uniform_location =
dispatch->glGetUniformLocation(gradient_prog, "stop_color4"); glGetUniformLocation(gradient_prog, "stop_color4");
stop_color5_uniform_location = stop_color5_uniform_location =
dispatch->glGetUniformLocation(gradient_prog, "stop_color5"); glGetUniformLocation(gradient_prog, "stop_color5");
stop_color6_uniform_location = stop_color6_uniform_location =
dispatch->glGetUniformLocation(gradient_prog, "stop_color6"); glGetUniformLocation(gradient_prog, "stop_color6");
stop_color7_uniform_location = stop_color7_uniform_location =
dispatch->glGetUniformLocation(gradient_prog, "stop_color7"); glGetUniformLocation(gradient_prog, "stop_color7");
} }
else { else {
stops_uniform_location = stops_uniform_location =
dispatch->glGetUniformLocation(gradient_prog, "stops"); glGetUniformLocation(gradient_prog, "stops");
stop_colors_uniform_location = stop_colors_uniform_location =
dispatch->glGetUniformLocation(gradient_prog, "stop_colors"); glGetUniformLocation(gradient_prog, "stop_colors");
} }
dispatch->glUseProgram(gradient_prog); glUseProgram(gradient_prog);
dispatch->glUniform1i(repeat_type_uniform_location, glUniform1i(repeat_type_uniform_location, src_picture->repeatType);
src_picture->repeatType);
/* set the transform matrix. */ /* set the transform matrix. */
if (src_picture->transform) { if (src_picture->transform) {
_glamor_gradient_convert_trans_matrix(src_picture->transform, _glamor_gradient_convert_trans_matrix(src_picture->transform,
transform_mat, width, height, 1); transform_mat, width, height, 1);
dispatch->glUniformMatrix3fv(transform_mat_uniform_location, glUniformMatrix3fv(transform_mat_uniform_location,
1, 1, &transform_mat[0][0]); 1, 1, &transform_mat[0][0]);
} }
else { else {
dispatch->glUniformMatrix3fv(transform_mat_uniform_location, glUniformMatrix3fv(transform_mat_uniform_location,
1, 1, &identity_mat[0][0]); 1, 1, &identity_mat[0][0]);
} }
if (!_glamor_gradient_set_pixmap_destination if (!_glamor_gradient_set_pixmap_destination
@ -1547,66 +1435,65 @@ glamor_generate_linear_gradient_picture(ScreenPtr screen,
if (src_picture->pSourcePict->linear.nstops + 2 <= LINEAR_SMALL_STOPS) { if (src_picture->pSourcePict->linear.nstops + 2 <= LINEAR_SMALL_STOPS) {
int j = 0; int j = 0;
dispatch->glUniform4f(stop_color0_uniform_location, glUniform4f(stop_color0_uniform_location,
stop_colors[4 * j + 0], stop_colors[4 * j + 1], stop_colors[4 * j + 0], stop_colors[4 * j + 1],
stop_colors[4 * j + 2], stop_colors[4 * j + 3]); stop_colors[4 * j + 2], stop_colors[4 * j + 3]);
j++; j++;
dispatch->glUniform4f(stop_color1_uniform_location, glUniform4f(stop_color1_uniform_location,
stop_colors[4 * j + 0], stop_colors[4 * j + 1], stop_colors[4 * j + 0], stop_colors[4 * j + 1],
stop_colors[4 * j + 2], stop_colors[4 * j + 3]); stop_colors[4 * j + 2], stop_colors[4 * j + 3]);
j++; j++;
dispatch->glUniform4f(stop_color2_uniform_location, glUniform4f(stop_color2_uniform_location,
stop_colors[4 * j + 0], stop_colors[4 * j + 1], stop_colors[4 * j + 0], stop_colors[4 * j + 1],
stop_colors[4 * j + 2], stop_colors[4 * j + 3]); stop_colors[4 * j + 2], stop_colors[4 * j + 3]);
j++; j++;
dispatch->glUniform4f(stop_color3_uniform_location, glUniform4f(stop_color3_uniform_location,
stop_colors[4 * j + 0], stop_colors[4 * j + 1], stop_colors[4 * j + 0], stop_colors[4 * j + 1],
stop_colors[4 * j + 2], stop_colors[4 * j + 3]); stop_colors[4 * j + 2], stop_colors[4 * j + 3]);
j++; j++;
dispatch->glUniform4f(stop_color4_uniform_location, glUniform4f(stop_color4_uniform_location,
stop_colors[4 * j + 0], stop_colors[4 * j + 1], stop_colors[4 * j + 0], stop_colors[4 * j + 1],
stop_colors[4 * j + 2], stop_colors[4 * j + 3]); stop_colors[4 * j + 2], stop_colors[4 * j + 3]);
j++; j++;
dispatch->glUniform4f(stop_color5_uniform_location, glUniform4f(stop_color5_uniform_location,
stop_colors[4 * j + 0], stop_colors[4 * j + 1], stop_colors[4 * j + 0], stop_colors[4 * j + 1],
stop_colors[4 * j + 2], stop_colors[4 * j + 3]); stop_colors[4 * j + 2], stop_colors[4 * j + 3]);
j++; j++;
dispatch->glUniform4f(stop_color6_uniform_location, glUniform4f(stop_color6_uniform_location,
stop_colors[4 * j + 0], stop_colors[4 * j + 1], stop_colors[4 * j + 0], stop_colors[4 * j + 1],
stop_colors[4 * j + 2], stop_colors[4 * j + 3]); stop_colors[4 * j + 2], stop_colors[4 * j + 3]);
j++; j++;
dispatch->glUniform4f(stop_color7_uniform_location, glUniform4f(stop_color7_uniform_location,
stop_colors[4 * j + 0], stop_colors[4 * j + 1], stop_colors[4 * j + 0], stop_colors[4 * j + 1],
stop_colors[4 * j + 2], stop_colors[4 * j + 3]); stop_colors[4 * j + 2], stop_colors[4 * j + 3]);
j = 0; j = 0;
dispatch->glUniform1f(stop0_uniform_location, n_stops[j++]); glUniform1f(stop0_uniform_location, n_stops[j++]);
dispatch->glUniform1f(stop1_uniform_location, n_stops[j++]); glUniform1f(stop1_uniform_location, n_stops[j++]);
dispatch->glUniform1f(stop2_uniform_location, n_stops[j++]); glUniform1f(stop2_uniform_location, n_stops[j++]);
dispatch->glUniform1f(stop3_uniform_location, n_stops[j++]); glUniform1f(stop3_uniform_location, n_stops[j++]);
dispatch->glUniform1f(stop4_uniform_location, n_stops[j++]); glUniform1f(stop4_uniform_location, n_stops[j++]);
dispatch->glUniform1f(stop5_uniform_location, n_stops[j++]); glUniform1f(stop5_uniform_location, n_stops[j++]);
dispatch->glUniform1f(stop6_uniform_location, n_stops[j++]); glUniform1f(stop6_uniform_location, n_stops[j++]);
dispatch->glUniform1f(stop7_uniform_location, n_stops[j++]); glUniform1f(stop7_uniform_location, n_stops[j++]);
dispatch->glUniform1i(n_stop_uniform_location, count); glUniform1i(n_stop_uniform_location, count);
} }
else { else {
dispatch->glUniform4fv(stop_colors_uniform_location, count, glUniform4fv(stop_colors_uniform_location, count, stop_colors);
stop_colors); glUniform1fv(stops_uniform_location, count, n_stops);
dispatch->glUniform1fv(stops_uniform_location, count, n_stops); glUniform1i(n_stop_uniform_location, count);
dispatch->glUniform1i(n_stop_uniform_location, count);
} }
if (src_picture->pSourcePict->linear.p2.y == src_picture->pSourcePict->linear.p1.y) { // The horizontal case. if (src_picture->pSourcePict->linear.p2.y == src_picture->pSourcePict->linear.p1.y) { // The horizontal case.
dispatch->glUniform1i(hor_ver_uniform_location, 1); glUniform1i(hor_ver_uniform_location, 1);
DEBUGF("p1.y: %f, p2.y: %f, enter the horizontal case\n", DEBUGF("p1.y: %f, p2.y: %f, enter the horizontal case\n",
pt1[1], pt2[1]); pt1[1], pt2[1]);
p1_distance = pt1[0]; p1_distance = pt1[0];
pt_distance = (pt2[0] - p1_distance); pt_distance = (pt2[0] - p1_distance);
dispatch->glUniform1f(p1_distance_uniform_location, p1_distance); glUniform1f(p1_distance_uniform_location, p1_distance);
dispatch->glUniform1f(pt_distance_uniform_location, pt_distance); glUniform1f(pt_distance_uniform_location, pt_distance);
} }
else { else {
/* The slope need to compute here. In shader, the viewport set will change /* The slope need to compute here. In shader, the viewport set will change
@ -1616,20 +1503,20 @@ glamor_generate_linear_gradient_picture(ScreenPtr screen,
(float) (src_picture->pSourcePict->linear.p2.y (float) (src_picture->pSourcePict->linear.p2.y
- src_picture->pSourcePict->linear.p1.y); - src_picture->pSourcePict->linear.p1.y);
slope = slope * yscale / xscale; slope = slope * yscale / xscale;
dispatch->glUniform1f(pt_slope_uniform_location, slope); glUniform1f(pt_slope_uniform_location, slope);
dispatch->glUniform1i(hor_ver_uniform_location, 0); glUniform1i(hor_ver_uniform_location, 0);
cos_val = sqrt(1.0 / (slope * slope + 1.0)); cos_val = sqrt(1.0 / (slope * slope + 1.0));
dispatch->glUniform1f(cos_val_uniform_location, cos_val); glUniform1f(cos_val_uniform_location, cos_val);
p1_distance = (pt1[1] - pt1[0] * slope) * cos_val; p1_distance = (pt1[1] - pt1[0] * slope) * cos_val;
pt_distance = (pt2[1] - pt2[0] * slope) * cos_val - p1_distance; pt_distance = (pt2[1] - pt2[0] * slope) * cos_val - p1_distance;
dispatch->glUniform1f(p1_distance_uniform_location, p1_distance); glUniform1f(p1_distance_uniform_location, p1_distance);
dispatch->glUniform1f(pt_distance_uniform_location, pt_distance); glUniform1f(pt_distance_uniform_location, pt_distance);
} }
/* Now rendering. */ /* Now rendering. */
dispatch->glDrawArrays(GL_TRIANGLE_STRIP, 0, 4); glDrawArrays(GL_TRIANGLE_STRIP, 0, 4);
/* Do the clear logic. */ /* Do the clear logic. */
if (stops_count > LINEAR_SMALL_STOPS) { if (stops_count > LINEAR_SMALL_STOPS) {
@ -1637,14 +1524,14 @@ glamor_generate_linear_gradient_picture(ScreenPtr screen,
free(stop_colors); free(stop_colors);
} }
dispatch->glBindBuffer(GL_ARRAY_BUFFER, 0); glBindBuffer(GL_ARRAY_BUFFER, 0);
dispatch->glBindBuffer(GL_ELEMENT_ARRAY_BUFFER, 0); glBindBuffer(GL_ELEMENT_ARRAY_BUFFER, 0);
dispatch->glDisableVertexAttribArray(GLAMOR_VERTEX_POS); glDisableVertexAttribArray(GLAMOR_VERTEX_POS);
dispatch->glDisableVertexAttribArray(GLAMOR_VERTEX_SOURCE); glDisableVertexAttribArray(GLAMOR_VERTEX_SOURCE);
dispatch->glUseProgram(0); glUseProgram(0);
glamor_put_dispatch(glamor_priv); glamor_put_context(glamor_priv);
return dst_picture; return dst_picture;
GRADIENT_FAIL: GRADIENT_FAIL:
@ -1659,13 +1546,13 @@ glamor_generate_linear_gradient_picture(ScreenPtr screen,
free(stop_colors); free(stop_colors);
} }
dispatch->glBindBuffer(GL_ARRAY_BUFFER, 0); glBindBuffer(GL_ARRAY_BUFFER, 0);
dispatch->glBindBuffer(GL_ELEMENT_ARRAY_BUFFER, 0); glBindBuffer(GL_ELEMENT_ARRAY_BUFFER, 0);
dispatch->glDisableVertexAttribArray(GLAMOR_VERTEX_POS); glDisableVertexAttribArray(GLAMOR_VERTEX_POS);
dispatch->glDisableVertexAttribArray(GLAMOR_VERTEX_SOURCE); glDisableVertexAttribArray(GLAMOR_VERTEX_SOURCE);
dispatch->glUseProgram(0); glUseProgram(0);
glamor_put_dispatch(glamor_priv); glamor_put_context(glamor_priv);
return NULL; return NULL;
} }

3
glamor/glamor_picture.c
View File

@ -93,8 +93,7 @@ glamor_create_picture(PicturePtr picture)
* we have to mark this pixmap as a separated texture, and don't * we have to mark this pixmap as a separated texture, and don't
* fallback to DDX layer. */ * fallback to DDX layer. */
if (pixmap_priv->type == GLAMOR_TEXTURE_DRM if (pixmap_priv->type == GLAMOR_TEXTURE_DRM
&& !glamor_pict_format_is_compatible(picture->format, && !glamor_pict_format_is_compatible(picture))
pixmap->drawable.depth))
glamor_set_pixmap_type(pixmap, GLAMOR_SEPARATE_TEXTURE); glamor_set_pixmap_type(pixmap, GLAMOR_SEPARATE_TEXTURE);
} }
} }

547
glamor/glamor_pixmap.c
View File

@ -66,18 +66,12 @@ void
glamor_set_destination_pixmap_fbo(glamor_pixmap_fbo *fbo, int x0, int y0, glamor_set_destination_pixmap_fbo(glamor_pixmap_fbo *fbo, int x0, int y0,
int width, int height) int width, int height)
{ {
glamor_gl_dispatch *dispatch = glamor_get_dispatch(fbo->glamor_priv); glamor_get_context(fbo->glamor_priv);
dispatch->glBindFramebuffer(GL_FRAMEBUFFER, fbo->fb); glBindFramebuffer(GL_FRAMEBUFFER, fbo->fb);
#ifndef GLAMOR_GLES2 glViewport(x0, y0, width, height);
dispatch->glMatrixMode(GL_PROJECTION);
dispatch->glLoadIdentity();
dispatch->glMatrixMode(GL_MODELVIEW);
dispatch->glLoadIdentity();
#endif
dispatch->glViewport(x0, y0, width, height);
glamor_put_dispatch(fbo->glamor_priv); glamor_put_context(fbo->glamor_priv);
} }
void void
@ -121,71 +115,387 @@ glamor_set_planemask(PixmapPtr pixmap, unsigned long planemask)
} }
Bool Bool
glamor_set_alu(struct glamor_gl_dispatch *dispatch, unsigned char alu) glamor_set_alu(ScreenPtr screen, unsigned char alu)
{ {
#ifndef GLAMOR_GLES2 glamor_screen_private *glamor_priv = glamor_get_screen_private(screen);
if (glamor_priv->gl_flavor == GLAMOR_GL_ES2) {
if (alu != GXcopy)
return FALSE;
else
return TRUE;
}
if (alu == GXcopy) { if (alu == GXcopy) {
dispatch->glDisable(GL_COLOR_LOGIC_OP); glDisable(GL_COLOR_LOGIC_OP);
return TRUE; return TRUE;
} }
dispatch->glEnable(GL_COLOR_LOGIC_OP); glEnable(GL_COLOR_LOGIC_OP);
switch (alu) { switch (alu) {
case GXclear: case GXclear:
dispatch->glLogicOp(GL_CLEAR); glLogicOp(GL_CLEAR);
break; break;
case GXand: case GXand:
dispatch->glLogicOp(GL_AND); glLogicOp(GL_AND);
break; break;
case GXandReverse: case GXandReverse:
dispatch->glLogicOp(GL_AND_REVERSE); glLogicOp(GL_AND_REVERSE);
break; break;
case GXandInverted: case GXandInverted:
dispatch->glLogicOp(GL_AND_INVERTED); glLogicOp(GL_AND_INVERTED);
break; break;
case GXnoop: case GXnoop:
dispatch->glLogicOp(GL_NOOP); glLogicOp(GL_NOOP);
break; break;
case GXxor: case GXxor:
dispatch->glLogicOp(GL_XOR); glLogicOp(GL_XOR);
break; break;
case GXor: case GXor:
dispatch->glLogicOp(GL_OR); glLogicOp(GL_OR);
break; break;
case GXnor: case GXnor:
dispatch->glLogicOp(GL_NOR); glLogicOp(GL_NOR);
break; break;
case GXequiv: case GXequiv:
dispatch->glLogicOp(GL_EQUIV); glLogicOp(GL_EQUIV);
break; break;
case GXinvert: case GXinvert:
dispatch->glLogicOp(GL_INVERT); glLogicOp(GL_INVERT);
break; break;
case GXorReverse: case GXorReverse:
dispatch->glLogicOp(GL_OR_REVERSE); glLogicOp(GL_OR_REVERSE);
break; break;
case GXcopyInverted: case GXcopyInverted:
dispatch->glLogicOp(GL_COPY_INVERTED); glLogicOp(GL_COPY_INVERTED);
break; break;
case GXorInverted: case GXorInverted:
dispatch->glLogicOp(GL_OR_INVERTED); glLogicOp(GL_OR_INVERTED);
break; break;
case GXnand: case GXnand:
dispatch->glLogicOp(GL_NAND); glLogicOp(GL_NAND);
break; break;
case GXset: case GXset:
dispatch->glLogicOp(GL_SET); glLogicOp(GL_SET);
break; break;
default: default:
glamor_fallback("unsupported alu %x\n", alu); glamor_fallback("unsupported alu %x\n", alu);
return FALSE; return FALSE;
} }
#else
if (alu != GXcopy)
return FALSE;
#endif
return TRUE; return TRUE;
} }
/*
* Map picture's format to the correct gl texture format and type.
* no_alpha is used to indicate whehter we need to wire alpha to 1.
*
* Although opengl support A1/GL_BITMAP, we still don't use it
* here, it seems that mesa has bugs when uploading a A1 bitmap.
*
* Return 0 if find a matched texture type. Otherwise return -1.
**/
static int
glamor_get_tex_format_type_from_pictformat_gl(PictFormatShort format,
GLenum *tex_format,
GLenum *tex_type,
int *no_alpha,
int *revert,
int *swap_rb, int is_upload)
{
*no_alpha = 0;
*revert = REVERT_NONE;
*swap_rb = is_upload ? SWAP_NONE_UPLOADING : SWAP_NONE_DOWNLOADING;
switch (format) {
case PICT_a1:
*tex_format = GL_ALPHA;
*tex_type = GL_UNSIGNED_BYTE;
*revert = is_upload ? REVERT_UPLOADING_A1 : REVERT_DOWNLOADING_A1;
break;
case PICT_b8g8r8x8:
*no_alpha = 1;
case PICT_b8g8r8a8:
*tex_format = GL_BGRA;
*tex_type = GL_UNSIGNED_INT_8_8_8_8;
break;
case PICT_x8r8g8b8:
*no_alpha = 1;
case PICT_a8r8g8b8:
*tex_format = GL_BGRA;
*tex_type = GL_UNSIGNED_INT_8_8_8_8_REV;
break;
case PICT_x8b8g8r8:
*no_alpha = 1;
case PICT_a8b8g8r8:
*tex_format = GL_RGBA;
*tex_type = GL_UNSIGNED_INT_8_8_8_8_REV;
break;
case PICT_x2r10g10b10:
*no_alpha = 1;
case PICT_a2r10g10b10:
*tex_format = GL_BGRA;
*tex_type = GL_UNSIGNED_INT_2_10_10_10_REV;
break;
case PICT_x2b10g10r10:
*no_alpha = 1;
case PICT_a2b10g10r10:
*tex_format = GL_RGBA;
*tex_type = GL_UNSIGNED_INT_2_10_10_10_REV;
break;
case PICT_r5g6b5:
*tex_format = GL_RGB;
*tex_type = GL_UNSIGNED_SHORT_5_6_5;
break;
case PICT_b5g6r5:
*tex_format = GL_RGB;
*tex_type = GL_UNSIGNED_SHORT_5_6_5_REV;
break;
case PICT_x1b5g5r5:
*no_alpha = 1;
case PICT_a1b5g5r5:
*tex_format = GL_RGBA;
*tex_type = GL_UNSIGNED_SHORT_1_5_5_5_REV;
break;
case PICT_x1r5g5b5:
*no_alpha = 1;
case PICT_a1r5g5b5:
*tex_format = GL_BGRA;
*tex_type = GL_UNSIGNED_SHORT_1_5_5_5_REV;
break;
case PICT_a8:
*tex_format = GL_ALPHA;
*tex_type = GL_UNSIGNED_BYTE;
break;
case PICT_x4r4g4b4:
*no_alpha = 1;
case PICT_a4r4g4b4:
*tex_format = GL_BGRA;
*tex_type = GL_UNSIGNED_SHORT_4_4_4_4_REV;
break;
case PICT_x4b4g4r4:
*no_alpha = 1;
case PICT_a4b4g4r4:
*tex_format = GL_RGBA;
*tex_type = GL_UNSIGNED_SHORT_4_4_4_4_REV;
break;
default:
LogMessageVerb(X_INFO, 0,
"fail to get matched format for %x \n", format);
return -1;
}
return 0;
}
#define IS_LITTLE_ENDIAN (IMAGE_BYTE_ORDER == LSBFirst)
static int
glamor_get_tex_format_type_from_pictformat_gles2(PictFormatShort format,
GLenum *tex_format,
GLenum *tex_type,
int *no_alpha,
int *revert,
int *swap_rb, int is_upload)
{
int need_swap_rb = 0;
*no_alpha = 0;
*revert = IS_LITTLE_ENDIAN ? REVERT_NONE : REVERT_NORMAL;
switch (format) {
case PICT_b8g8r8x8:
*no_alpha = 1;
case PICT_b8g8r8a8:
*tex_format = GL_RGBA;
*tex_type = GL_UNSIGNED_BYTE;
need_swap_rb = 1;
*revert = IS_LITTLE_ENDIAN ? REVERT_NORMAL : REVERT_NONE;
break;
case PICT_x8r8g8b8:
*no_alpha = 1;
case PICT_a8r8g8b8:
*tex_format = GL_RGBA;
*tex_type = GL_UNSIGNED_BYTE;
need_swap_rb = 1;
break;
case PICT_x8b8g8r8:
*no_alpha = 1;
case PICT_a8b8g8r8:
*tex_format = GL_RGBA;
*tex_type = GL_UNSIGNED_BYTE;
break;
case PICT_x2r10g10b10:
*no_alpha = 1;
case PICT_a2r10g10b10:
*tex_format = GL_RGBA;
/* glReadPixmap doesn't support GL_UNSIGNED_INT_10_10_10_2.
* we have to use GL_UNSIGNED_BYTE and do the conversion in
* shader latter.*/
*tex_type = GL_UNSIGNED_BYTE;
if (is_upload == 1) {
if (!IS_LITTLE_ENDIAN)
*revert = REVERT_UPLOADING_10_10_10_2;
else
*revert = REVERT_UPLOADING_2_10_10_10;
}
else {
if (!IS_LITTLE_ENDIAN) {
*revert = REVERT_DOWNLOADING_10_10_10_2;
}
else {
*revert = REVERT_DOWNLOADING_2_10_10_10;
}
}
need_swap_rb = 1;
break;
case PICT_x2b10g10r10:
*no_alpha = 1;
case PICT_a2b10g10r10:
*tex_format = GL_RGBA;
*tex_type = GL_UNSIGNED_BYTE;
if (is_upload == 1) {
if (!IS_LITTLE_ENDIAN)
*revert = REVERT_UPLOADING_10_10_10_2;
else
*revert = REVERT_UPLOADING_2_10_10_10;
}
else {
if (!IS_LITTLE_ENDIAN) {
*revert = REVERT_DOWNLOADING_10_10_10_2;
}
else {
*revert = REVERT_DOWNLOADING_2_10_10_10;
}
}
break;
case PICT_r5g6b5:
*tex_format = GL_RGB;
*tex_type = GL_UNSIGNED_SHORT_5_6_5;
*revert = IS_LITTLE_ENDIAN ? REVERT_NONE : REVERT_NORMAL;
break;
case PICT_b5g6r5:
*tex_format = GL_RGB;
*tex_type = GL_UNSIGNED_SHORT_5_6_5;
need_swap_rb = IS_LITTLE_ENDIAN ? 1 : 0;;
break;
case PICT_x1b5g5r5:
*no_alpha = 1;
case PICT_a1b5g5r5:
*tex_format = GL_RGBA;
*tex_type = GL_UNSIGNED_SHORT_5_5_5_1;
if (IS_LITTLE_ENDIAN) {
*revert =
is_upload ? REVERT_UPLOADING_1_5_5_5 :
REVERT_DOWNLOADING_1_5_5_5;
}
else
*revert = REVERT_NONE;
break;
case PICT_x1r5g5b5:
*no_alpha = 1;
case PICT_a1r5g5b5:
*tex_format = GL_RGBA;
*tex_type = GL_UNSIGNED_SHORT_5_5_5_1;
if (IS_LITTLE_ENDIAN) {
*revert =
is_upload ? REVERT_UPLOADING_1_5_5_5 :
REVERT_DOWNLOADING_1_5_5_5;
}
else
*revert = REVERT_NONE;
need_swap_rb = 1;
break;
case PICT_a1:
*tex_format = GL_ALPHA;
*tex_type = GL_UNSIGNED_BYTE;
*revert = is_upload ? REVERT_UPLOADING_A1 : REVERT_DOWNLOADING_A1;
break;
case PICT_a8:
*tex_format = GL_ALPHA;
*tex_type = GL_UNSIGNED_BYTE;
*revert = REVERT_NONE;
break;
case PICT_x4r4g4b4:
*no_alpha = 1;
case PICT_a4r4g4b4:
*tex_format = GL_RGBA;
*tex_type = GL_UNSIGNED_SHORT_4_4_4_4;
*revert = IS_LITTLE_ENDIAN ? REVERT_NORMAL : REVERT_NONE;
need_swap_rb = 1;
break;
case PICT_x4b4g4r4:
*no_alpha = 1;
case PICT_a4b4g4r4:
*tex_format = GL_RGBA;
*tex_type = GL_UNSIGNED_SHORT_4_4_4_4;
*revert = IS_LITTLE_ENDIAN ? REVERT_NORMAL : REVERT_NONE;
break;
default:
LogMessageVerb(X_INFO, 0,
"fail to get matched format for %x \n", format);
return -1;
}
if (need_swap_rb)
*swap_rb = is_upload ? SWAP_UPLOADING : SWAP_DOWNLOADING;
else
*swap_rb = is_upload ? SWAP_NONE_UPLOADING : SWAP_NONE_DOWNLOADING;
return 0;
}
static int
glamor_get_tex_format_type_from_pixmap(PixmapPtr pixmap,
GLenum *format,
GLenum *type,
int *no_alpha,
int *revert, int *swap_rb, int is_upload)
{
glamor_pixmap_private *pixmap_priv;
PictFormatShort pict_format;
glamor_screen_private *glamor_priv =
glamor_get_screen_private(pixmap->drawable.pScreen);
pixmap_priv = glamor_get_pixmap_private(pixmap);
if (GLAMOR_PIXMAP_PRIV_IS_PICTURE(pixmap_priv))
pict_format = pixmap_priv->base.picture->format;
else
pict_format = format_for_depth(pixmap->drawable.depth);
if (glamor_priv->gl_flavor == GLAMOR_GL_DESKTOP) {
return glamor_get_tex_format_type_from_pictformat_gl(pict_format,
format, type,
no_alpha,
revert,
swap_rb,
is_upload);
} else {
return glamor_get_tex_format_type_from_pictformat_gles2(pict_format,
format, type,
no_alpha,
revert,
swap_rb,
is_upload);
}
}
static void * static void *
_glamor_color_convert_a1_a8(void *src_bits, void *dst_bits, int w, int h, _glamor_color_convert_a1_a8(void *src_bits, void *dst_bits, int w, int h,
int stride, int revert) int stride, int revert)
@ -397,38 +707,35 @@ __glamor_upload_pixmap_to_texture(PixmapPtr pixmap, unsigned int *tex,
{ {
glamor_screen_private *glamor_priv = glamor_screen_private *glamor_priv =
glamor_get_screen_private(pixmap->drawable.pScreen); glamor_get_screen_private(pixmap->drawable.pScreen);
glamor_gl_dispatch *dispatch;
int non_sub = 0; int non_sub = 0;
unsigned int iformat = 0; unsigned int iformat = 0;
dispatch = glamor_get_dispatch(glamor_priv); glamor_get_context(glamor_priv);
if (*tex == 0) { if (*tex == 0) {
dispatch->glGenTextures(1, tex); glGenTextures(1, tex);
if (glamor_priv->gl_flavor == GLAMOR_GL_DESKTOP) if (glamor_priv->gl_flavor == GLAMOR_GL_DESKTOP)
gl_iformat_for_depth(pixmap->drawable.depth, &iformat); iformat = gl_iformat_for_pixmap(pixmap);
else else
iformat = format; iformat = format;
non_sub = 1; non_sub = 1;
assert(x == 0 && y == 0); assert(x == 0 && y == 0);
} }
dispatch->glBindTexture(GL_TEXTURE_2D, *tex); glBindTexture(GL_TEXTURE_2D, *tex);
dispatch->glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST); glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST);
dispatch->glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST); glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
dispatch->glPixelStorei(GL_UNPACK_ALIGNMENT, 4); glPixelStorei(GL_UNPACK_ALIGNMENT, 4);
if (bits == NULL) if (bits == NULL)
dispatch->glBindBuffer(GL_PIXEL_UNPACK_BUFFER, pbo); glBindBuffer(GL_PIXEL_UNPACK_BUFFER, pbo);
if (non_sub) if (non_sub)
dispatch->glTexImage2D(GL_TEXTURE_2D, glTexImage2D(GL_TEXTURE_2D, 0, iformat, w, h, 0, format, type, bits);
0, iformat, w, h, 0, format, type, bits);
else else
dispatch->glTexSubImage2D(GL_TEXTURE_2D, glTexSubImage2D(GL_TEXTURE_2D, 0, x, y, w, h, format, type, bits);
0, x, y, w, h, format, type, bits);
if (bits == NULL) if (bits == NULL)
dispatch->glBindBuffer(GL_PIXEL_UNPACK_BUFFER, 0); glBindBuffer(GL_PIXEL_UNPACK_BUFFER, 0);
glamor_put_dispatch(glamor_priv); glamor_put_context(glamor_priv);
} }
static Bool static Bool
@ -440,7 +747,6 @@ _glamor_upload_bits_to_pixmap_texture(PixmapPtr pixmap, GLenum format,
glamor_pixmap_private *pixmap_priv = glamor_get_pixmap_private(pixmap); glamor_pixmap_private *pixmap_priv = glamor_get_pixmap_private(pixmap);
glamor_screen_private *glamor_priv = glamor_screen_private *glamor_priv =
glamor_get_screen_private(pixmap->drawable.pScreen); glamor_get_screen_private(pixmap->drawable.pScreen);
glamor_gl_dispatch *dispatch;
static float vertices[8]; static float vertices[8];
static float texcoords[8] = { 0, 1, static float texcoords[8] = { 0, 1,
@ -526,42 +832,35 @@ _glamor_upload_bits_to_pixmap_texture(PixmapPtr pixmap, GLenum format,
x + w, y + h, x + w, y + h,
glamor_priv->yInverted, vertices); glamor_priv->yInverted, vertices);
/* Slow path, we need to flip y or wire alpha to 1. */ /* Slow path, we need to flip y or wire alpha to 1. */
dispatch = glamor_get_dispatch(glamor_priv); glamor_get_context(glamor_priv);
dispatch->glVertexAttribPointer(GLAMOR_VERTEX_POS, 2, GL_FLOAT, glVertexAttribPointer(GLAMOR_VERTEX_POS, 2, GL_FLOAT,
GL_FALSE, 2 * sizeof(float), vertices); GL_FALSE, 2 * sizeof(float), vertices);
dispatch->glEnableVertexAttribArray(GLAMOR_VERTEX_POS); glEnableVertexAttribArray(GLAMOR_VERTEX_POS);
dispatch->glVertexAttribPointer(GLAMOR_VERTEX_SOURCE, 2, GL_FLOAT, glVertexAttribPointer(GLAMOR_VERTEX_SOURCE, 2, GL_FLOAT,
GL_FALSE, 2 * sizeof(float), ptexcoords); GL_FALSE, 2 * sizeof(float), ptexcoords);
dispatch->glEnableVertexAttribArray(GLAMOR_VERTEX_SOURCE); glEnableVertexAttribArray(GLAMOR_VERTEX_SOURCE);
glamor_set_destination_pixmap_priv_nc(pixmap_priv); glamor_set_destination_pixmap_priv_nc(pixmap_priv);
__glamor_upload_pixmap_to_texture(pixmap, &tex, __glamor_upload_pixmap_to_texture(pixmap, &tex,
format, type, 0, 0, w, h, bits, pbo); format, type, 0, 0, w, h, bits, pbo);
dispatch->glActiveTexture(GL_TEXTURE0); glActiveTexture(GL_TEXTURE0);
dispatch->glBindTexture(GL_TEXTURE_2D, tex); glBindTexture(GL_TEXTURE_2D, tex);
dispatch->glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST); glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST);
dispatch->glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST); glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
#ifndef GLAMOR_GLES2 glUseProgram(glamor_priv->finish_access_prog[no_alpha]);
dispatch->glEnable(GL_TEXTURE_2D); glUniform1i(glamor_priv->finish_access_revert[no_alpha], revert);
#endif glUniform1i(glamor_priv->finish_access_swap_rb[no_alpha], swap_rb);
dispatch->glUseProgram(glamor_priv->finish_access_prog[no_alpha]);
dispatch->glUniform1i(glamor_priv->finish_access_revert[no_alpha], revert);
dispatch->glUniform1i(glamor_priv->finish_access_swap_rb[no_alpha],
swap_rb);
dispatch->glDrawArrays(GL_TRIANGLE_FAN, 0, 4); glDrawArrays(GL_TRIANGLE_FAN, 0, 4);
#ifndef GLAMOR_GLES2 glUseProgram(0);
dispatch->glDisable(GL_TEXTURE_2D); glDisableVertexAttribArray(GLAMOR_VERTEX_POS);
#endif glDisableVertexAttribArray(GLAMOR_VERTEX_SOURCE);
dispatch->glUseProgram(0); glDeleteTextures(1, &tex);
dispatch->glDisableVertexAttribArray(GLAMOR_VERTEX_POS); glBindFramebuffer(GL_FRAMEBUFFER, 0);
dispatch->glDisableVertexAttribArray(GLAMOR_VERTEX_SOURCE);
dispatch->glDeleteTextures(1, &tex);
dispatch->glBindFramebuffer(GL_FRAMEBUFFER, 0);
glamor_put_dispatch(glamor_priv); glamor_put_context(glamor_priv);
if (need_free_bits) if (need_free_bits)
free(bits); free(bits);
@ -615,7 +914,7 @@ glamor_pixmap_upload_prepare(PixmapPtr pixmap, GLenum format, int no_alpha,
return 0; return 0;
if (glamor_priv->gl_flavor == GLAMOR_GL_DESKTOP) if (glamor_priv->gl_flavor == GLAMOR_GL_DESKTOP)
gl_iformat_for_depth(pixmap->drawable.depth, &iformat); iformat = gl_iformat_for_pixmap(pixmap);
else else
iformat = format; iformat = format;
@ -831,7 +1130,6 @@ glamor_es2_pixmap_read_prepare(PixmapPtr source, int x, int y, int w, int h,
glamor_screen_private *glamor_priv; glamor_screen_private *glamor_priv;
ScreenPtr screen; ScreenPtr screen;
glamor_pixmap_fbo *temp_fbo; glamor_pixmap_fbo *temp_fbo;
glamor_gl_dispatch *dispatch;
float temp_xscale, temp_yscale, source_xscale, source_yscale; float temp_xscale, temp_yscale, source_xscale, source_yscale;
static float vertices[8]; static float vertices[8];
static float texcoords[8]; static float texcoords[8];
@ -844,7 +1142,7 @@ glamor_es2_pixmap_read_prepare(PixmapPtr source, int x, int y, int w, int h,
if (temp_fbo == NULL) if (temp_fbo == NULL)
return NULL; return NULL;
dispatch = glamor_get_dispatch(glamor_priv); glamor_get_context(glamor_priv);
temp_xscale = 1.0 / w; temp_xscale = 1.0 / w;
temp_yscale = 1.0 / h; temp_yscale = 1.0 / h;
@ -852,9 +1150,9 @@ glamor_es2_pixmap_read_prepare(PixmapPtr source, int x, int y, int w, int h,
temp_xscale, temp_yscale, 0, 0, w, h, temp_xscale, temp_yscale, 0, 0, w, h,
glamor_priv->yInverted, vertices); glamor_priv->yInverted, vertices);
dispatch->glVertexAttribPointer(GLAMOR_VERTEX_POS, 2, GL_FLOAT, glVertexAttribPointer(GLAMOR_VERTEX_POS, 2, GL_FLOAT, GL_FALSE,
GL_FALSE, 2 * sizeof(float), vertices); 2 * sizeof(float), vertices);
dispatch->glEnableVertexAttribArray(GLAMOR_VERTEX_POS); glEnableVertexAttribArray(GLAMOR_VERTEX_POS);
pixmap_priv_get_scale(source_priv, &source_xscale, &source_yscale); pixmap_priv_get_scale(source_priv, &source_xscale, &source_yscale);
glamor_set_normalize_tcoords(source_priv, source_xscale, glamor_set_normalize_tcoords(source_priv, source_xscale,
@ -863,27 +1161,26 @@ glamor_es2_pixmap_read_prepare(PixmapPtr source, int x, int y, int w, int h,
x + w, y + h, x + w, y + h,
glamor_priv->yInverted, texcoords); glamor_priv->yInverted, texcoords);
dispatch->glVertexAttribPointer(GLAMOR_VERTEX_SOURCE, 2, GL_FLOAT, glVertexAttribPointer(GLAMOR_VERTEX_SOURCE, 2, GL_FLOAT, GL_FALSE,
GL_FALSE, 2 * sizeof(float), texcoords); 2 * sizeof(float), texcoords);
dispatch->glEnableVertexAttribArray(GLAMOR_VERTEX_SOURCE); glEnableVertexAttribArray(GLAMOR_VERTEX_SOURCE);
dispatch->glActiveTexture(GL_TEXTURE0); glActiveTexture(GL_TEXTURE0);
dispatch->glBindTexture(GL_TEXTURE_2D, source_priv->base.fbo->tex); glBindTexture(GL_TEXTURE_2D, source_priv->base.fbo->tex);
dispatch->glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST); glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST);
dispatch->glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST); glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
glamor_set_destination_pixmap_fbo(temp_fbo, 0, 0, w, h); glamor_set_destination_pixmap_fbo(temp_fbo, 0, 0, w, h);
dispatch->glUseProgram(glamor_priv->finish_access_prog[no_alpha]); glUseProgram(glamor_priv->finish_access_prog[no_alpha]);
dispatch->glUniform1i(glamor_priv->finish_access_revert[no_alpha], revert); glUniform1i(glamor_priv->finish_access_revert[no_alpha], revert);
dispatch->glUniform1i(glamor_priv->finish_access_swap_rb[no_alpha], glUniform1i(glamor_priv->finish_access_swap_rb[no_alpha], swap_rb);
swap_rb);
dispatch->glDrawArrays(GL_TRIANGLE_FAN, 0, 4); glDrawArrays(GL_TRIANGLE_FAN, 0, 4);
dispatch->glDisableVertexAttribArray(GLAMOR_VERTEX_POS); glDisableVertexAttribArray(GLAMOR_VERTEX_POS);
dispatch->glDisableVertexAttribArray(GLAMOR_VERTEX_SOURCE); glDisableVertexAttribArray(GLAMOR_VERTEX_SOURCE);
dispatch->glUseProgram(0); glUseProgram(0);
glamor_put_dispatch(glamor_priv); glamor_put_context(glamor_priv);
return temp_fbo; return temp_fbo;
} }
@ -905,7 +1202,6 @@ _glamor_download_sub_pixmap_to_cpu(PixmapPtr pixmap, GLenum format,
void *data, *read; void *data, *read;
glamor_screen_private *glamor_priv = glamor_screen_private *glamor_priv =
glamor_get_screen_private(pixmap->drawable.pScreen); glamor_get_screen_private(pixmap->drawable.pScreen);
glamor_gl_dispatch *dispatch;
glamor_pixmap_fbo *temp_fbo = NULL; glamor_pixmap_fbo *temp_fbo = NULL;
int need_post_conversion = 0; int need_post_conversion = 0;
int need_free_data = 0; int need_free_data = 0;
@ -964,57 +1260,53 @@ _glamor_download_sub_pixmap_to_cpu(PixmapPtr pixmap, GLenum format,
fbo_y_off = 0; fbo_y_off = 0;
} }
dispatch = glamor_get_dispatch(glamor_priv); glamor_get_context(glamor_priv);
dispatch->glPixelStorei(GL_PACK_ALIGNMENT, 4); glPixelStorei(GL_PACK_ALIGNMENT, 4);
if (glamor_priv->has_pack_invert || glamor_priv->yInverted) { if (glamor_priv->has_pack_invert || glamor_priv->yInverted) {
if (!glamor_priv->yInverted) { if (!glamor_priv->yInverted) {
assert(glamor_priv->gl_flavor == GLAMOR_GL_DESKTOP); assert(glamor_priv->gl_flavor == GLAMOR_GL_DESKTOP);
dispatch->glPixelStorei(GL_PACK_INVERT_MESA, 1); glPixelStorei(GL_PACK_INVERT_MESA, 1);
} }
if (glamor_priv->gl_flavor == GLAMOR_GL_DESKTOP && data == NULL) { if (glamor_priv->gl_flavor == GLAMOR_GL_DESKTOP && data == NULL) {
assert(pbo > 0); assert(pbo > 0);
dispatch->glBindBuffer(GL_PIXEL_PACK_BUFFER, pbo); glBindBuffer(GL_PIXEL_PACK_BUFFER, pbo);
dispatch->glBufferData(GL_PIXEL_PACK_BUFFER, glBufferData(GL_PIXEL_PACK_BUFFER, stride * h, NULL, gl_usage);
stride * h, NULL, gl_usage);
} }
dispatch->glReadPixels(x + fbo_x_off, y + fbo_y_off, w, h, format, type, glReadPixels(x + fbo_x_off, y + fbo_y_off, w, h, format, type, data);
data);
if (!glamor_priv->yInverted) { if (!glamor_priv->yInverted) {
assert(glamor_priv->gl_flavor == GLAMOR_GL_DESKTOP); assert(glamor_priv->gl_flavor == GLAMOR_GL_DESKTOP);
dispatch->glPixelStorei(GL_PACK_INVERT_MESA, 0); glPixelStorei(GL_PACK_INVERT_MESA, 0);
} }
if (glamor_priv->gl_flavor == GLAMOR_GL_DESKTOP && bits == NULL) { if (glamor_priv->gl_flavor == GLAMOR_GL_DESKTOP && bits == NULL) {
bits = dispatch->glMapBuffer(GL_PIXEL_PACK_BUFFER, gl_access); bits = glMapBuffer(GL_PIXEL_PACK_BUFFER, gl_access);
dispatch->glBindBuffer(GL_PIXEL_PACK_BUFFER, 0); glBindBuffer(GL_PIXEL_PACK_BUFFER, 0);
} }
} }
else { else {
unsigned int temp_pbo; unsigned int temp_pbo;
int yy; int yy;
dispatch = glamor_get_dispatch(glamor_priv); glamor_get_context(glamor_priv);
dispatch->glGenBuffers(1, &temp_pbo); glGenBuffers(1, &temp_pbo);
dispatch->glBindBuffer(GL_PIXEL_PACK_BUFFER, temp_pbo); glBindBuffer(GL_PIXEL_PACK_BUFFER, temp_pbo);
dispatch->glBufferData(GL_PIXEL_PACK_BUFFER, glBufferData(GL_PIXEL_PACK_BUFFER, stride * h, NULL, GL_STREAM_READ);
stride * h, NULL, GL_STREAM_READ); glReadPixels(x + fbo_x_off, y + fbo_y_off, w, h, format, type, 0);
dispatch->glReadPixels(x + fbo_x_off, y + fbo_y_off, w, h, read = glMapBuffer(GL_PIXEL_PACK_BUFFER, GL_READ_ONLY);
format, type, 0);
read = dispatch->glMapBuffer(GL_PIXEL_PACK_BUFFER, GL_READ_ONLY);
for (yy = 0; yy < pixmap->drawable.height; yy++) for (yy = 0; yy < pixmap->drawable.height; yy++)
memcpy((char *) data + yy * stride, memcpy((char *) data + yy * stride,
(char *) read + (h - yy - 1) * stride, stride); (char *) read + (h - yy - 1) * stride, stride);
dispatch->glUnmapBuffer(GL_PIXEL_PACK_BUFFER); glUnmapBuffer(GL_PIXEL_PACK_BUFFER);
dispatch->glBindBuffer(GL_PIXEL_PACK_BUFFER, 0); glBindBuffer(GL_PIXEL_PACK_BUFFER, 0);
dispatch->glDeleteBuffers(1, &temp_pbo); glDeleteBuffers(1, &temp_pbo);
} }
dispatch->glBindFramebuffer(GL_FRAMEBUFFER, 0); glBindFramebuffer(GL_FRAMEBUFFER, 0);
glamor_put_dispatch(glamor_priv); glamor_put_context(glamor_priv);
if (need_post_conversion) { if (need_post_conversion) {
/* As OpenGL desktop version never enters here. /* As OpenGL desktop version never enters here.
@ -1168,7 +1460,6 @@ glamor_download_pixmap_to_cpu(PixmapPtr pixmap, glamor_access_t access)
void *data = NULL, *dst; void *data = NULL, *dst;
glamor_screen_private *glamor_priv = glamor_screen_private *glamor_priv =
glamor_get_screen_private(pixmap->drawable.pScreen); glamor_get_screen_private(pixmap->drawable.pScreen);
glamor_gl_dispatch *dispatch;
int pbo = 0; int pbo = 0;
if (!GLAMOR_PIXMAP_PRIV_HAS_FBO(pixmap_priv)) if (!GLAMOR_PIXMAP_PRIV_HAS_FBO(pixmap_priv))
@ -1189,10 +1480,10 @@ glamor_download_pixmap_to_cpu(PixmapPtr pixmap, glamor_access_t access)
data = malloc(stride * pixmap->drawable.height); data = malloc(stride * pixmap->drawable.height);
} }
else { else {
dispatch = glamor_get_dispatch(glamor_priv); glamor_get_context(glamor_priv);
if (pixmap_priv->base.fbo->pbo == 0) if (pixmap_priv->base.fbo->pbo == 0)
dispatch->glGenBuffers(1, &pixmap_priv->base.fbo->pbo); glGenBuffers(1, &pixmap_priv->base.fbo->pbo);
glamor_put_dispatch(glamor_priv); glamor_put_context(glamor_priv);
pbo = pixmap_priv->base.fbo->pbo; pbo = pixmap_priv->base.fbo->pbo;
} }

46
glamor/glamor_priv.h
View File

@ -35,23 +35,19 @@
#endif #endif
#include "glamor.h" #include "glamor.h"
#ifdef GLAMOR_GLES2 #include <epoxy/gl.h>
#include <GLES2/gl2.h>
#include <GLES2/gl2ext.h>
#define GLAMOR_DEFAULT_PRECISION "precision mediump float;\n" #define GLAMOR_DEFAULT_PRECISION \
#include "glamor_glext.h" "#ifdef GL_ES\n" \
#else "precision mediump float;\n" \
#include <GL/gl.h> "#endif\n"
#include <GL/glext.h>
#define GLAMOR_DEFAULT_PRECISION
#endif
#ifdef RENDER #ifdef RENDER
#include "glyphstr.h" #include "glyphstr.h"
#endif #endif
#include "glamor_debug.h" #include "glamor_debug.h"
#include "glamor_context.h"
#include <list.h> #include <list.h>
@ -145,13 +141,6 @@ enum gradient_shader {
SHADER_GRADIENT_COUNT, SHADER_GRADIENT_COUNT,
}; };
enum gradient_shader_prog {
SHADER_GRADIENT_VS_PROG,
SHADER_GRADIENT_FS_MAIN_PROG,
SHADER_GRADIENT_FS_GETCOLOR_PROG,
SHADER_GRADIENT_PROG_COUNT,
};
struct glamor_screen_private; struct glamor_screen_private;
struct glamor_pixmap_private; struct glamor_pixmap_private;
@ -178,8 +167,6 @@ typedef struct {
uint16_t evict; uint16_t evict;
} glamor_glyph_cache_t; } glamor_glyph_cache_t;
#include "glamor_gl_dispatch.h"
struct glamor_saved_procs { struct glamor_saved_procs {
CloseScreenProcPtr close_screen; CloseScreenProcPtr close_screen;
CreateGCProcPtr create_gc; CreateGCProcPtr create_gc;
@ -202,11 +189,7 @@ struct glamor_saved_procs {
SetWindowPixmapProcPtr set_window_pixmap; SetWindowPixmapProcPtr set_window_pixmap;
}; };
#ifdef GLAMOR_GLES2
#define CACHE_FORMAT_COUNT 3 #define CACHE_FORMAT_COUNT 3
#else
#define CACHE_FORMAT_COUNT 2
#endif
#define CACHE_BUCKET_WCOUNT 4 #define CACHE_BUCKET_WCOUNT 4
#define CACHE_BUCKET_HCOUNT 4 #define CACHE_BUCKET_HCOUNT 4
@ -220,8 +203,7 @@ struct glamor_saved_procs {
#define RENDER_IDEL_MAX 32 #define RENDER_IDEL_MAX 32
typedef struct glamor_screen_private { typedef struct glamor_screen_private {
struct glamor_gl_dispatch _dispatch; Bool yInverted;
int yInverted;
unsigned int tick; unsigned int tick;
enum glamor_gl_flavor gl_flavor; enum glamor_gl_flavor gl_flavor;
int has_pack_invert; int has_pack_invert;
@ -262,9 +244,7 @@ typedef struct glamor_screen_private {
/* glamor gradient, 0 for small nstops, 1 for /* glamor gradient, 0 for small nstops, 1 for
large nstops and 2 for dynamic generate. */ large nstops and 2 for dynamic generate. */
GLint gradient_prog[SHADER_GRADIENT_COUNT][3]; GLint gradient_prog[SHADER_GRADIENT_COUNT][3];
GLint linear_gradient_shaders[SHADER_GRADIENT_PROG_COUNT][3];
int linear_max_nstops; int linear_max_nstops;
GLint radial_gradient_shaders[SHADER_GRADIENT_PROG_COUNT][3];
int radial_max_nstops; int radial_max_nstops;
/* glamor trapezoid shader. */ /* glamor trapezoid shader. */
@ -288,6 +268,8 @@ typedef struct glamor_screen_private {
/* xv */ /* xv */
GLint xv_prog; GLint xv_prog;
struct glamor_context ctx;
} glamor_screen_private; } glamor_screen_private;
typedef enum glamor_access { typedef enum glamor_access {
@ -583,9 +565,8 @@ Bool glamor_stipple(PixmapPtr pixmap, PixmapPtr stipple,
unsigned char alu, unsigned long planemask, unsigned char alu, unsigned long planemask,
unsigned long fg_pixel, unsigned long bg_pixel, unsigned long fg_pixel, unsigned long bg_pixel,
int stipple_x, int stipple_y); int stipple_x, int stipple_y);
GLint glamor_compile_glsl_prog(glamor_gl_dispatch *dispatch, GLenum type, GLint glamor_compile_glsl_prog(GLenum type, const char *source);
const char *source); void glamor_link_glsl_prog(GLint prog);
void glamor_link_glsl_prog(glamor_gl_dispatch *dispatch, GLint prog);
void glamor_get_color_4f_from_pixel(PixmapPtr pixmap, void glamor_get_color_4f_from_pixel(PixmapPtr pixmap,
unsigned long fg_pixel, GLfloat *color); unsigned long fg_pixel, GLfloat *color);
@ -604,7 +585,7 @@ glamor_pixmap_fbo *glamor_es2_pixmap_read_prepare(PixmapPtr source, int x,
int no_alpha, int revert, int no_alpha, int revert,
int swap_rb); int swap_rb);
Bool glamor_set_alu(struct glamor_gl_dispatch *dispatch, unsigned char alu); Bool glamor_set_alu(ScreenPtr screen, unsigned char alu);
Bool glamor_set_planemask(PixmapPtr pixmap, unsigned long planemask); Bool glamor_set_planemask(PixmapPtr pixmap, unsigned long planemask);
Bool glamor_change_window_attributes(WindowPtr pWin, unsigned long mask); Bool glamor_change_window_attributes(WindowPtr pWin, unsigned long mask);
RegionPtr glamor_bitmap_to_region(PixmapPtr pixmap); RegionPtr glamor_bitmap_to_region(PixmapPtr pixmap);
@ -935,6 +916,9 @@ void glamor_composite_rectangles(CARD8 op,
xRenderColor *color, xRenderColor *color,
int num_rects, xRectangle *rects); int num_rects, xRectangle *rects);
extern _X_EXPORT void glamor_egl_screen_init(ScreenPtr screen,
struct glamor_context *glamor_ctx);
/* glamor_xv */ /* glamor_xv */
typedef struct { typedef struct {
uint32_t transform_index; uint32_t transform_index;

80
glamor/glamor_putimage.c
View File

@ -67,27 +67,26 @@ glamor_init_putimage_shaders(ScreenPtr screen)
if (!GLEW_ARB_fragment_shader) if (!GLEW_ARB_fragment_shader)
return; return;
prog = dispatch->glCreateProgram(); prog = glCreateProgram();
vs_prog = glamor_compile_glsl_prog(GL_VERTEX_SHADER, xybitmap_vs); vs_prog = glamor_compile_glsl_prog(GL_VERTEX_SHADER, xybitmap_vs);
fs_prog = glamor_compile_glsl_prog(GL_FRAGMENT_SHADER, xybitmap_fs); fs_prog = glamor_compile_glsl_prog(GL_FRAGMENT_SHADER, xybitmap_fs);
dispatch->glAttachShader(prog, vs_prog); glAttachShader(prog, vs_prog);
dispatch->glAttachShader(prog, fs_prog); glAttachShader(prog, fs_prog);
glamor_link_glsl_prog(prog); glamor_link_glsl_prog(prog);
dispatch->glUseProgram(prog); glUseProgram(prog);
sampler_uniform_location = sampler_uniform_location = glGetUniformLocation(prog, "bitmap_sampler");
dispatch->glGetUniformLocation(prog, "bitmap_sampler"); glUniform1i(sampler_uniform_location, 0);
dispatch->glUniform1i(sampler_uniform_location, 0);
glamor_priv->put_image_xybitmap_fg_uniform_location = glamor_priv->put_image_xybitmap_fg_uniform_location =
dispatch->glGetUniformLocation(prog, "fg"); glGetUniformLocation(prog, "fg");
glamor_priv->put_image_xybitmap_bg_uniform_location = glamor_priv->put_image_xybitmap_bg_uniform_location =
dispatch->glGetUniformLocation(prog, "bg"); glGetUniformLocation(prog, "bg");
glamor_get_transform_uniform_locations(prog, glamor_get_transform_uniform_locations(prog,
&glamor_priv-> &glamor_priv->
put_image_xybitmap_transform); put_image_xybitmap_transform);
glamor_priv->put_image_xybitmap_prog = prog; glamor_priv->put_image_xybitmap_prog = prog;
dispatch->glUseProgram(0); glUseProgram(0);
#endif #endif
} }
@ -162,40 +161,37 @@ glamor_put_image_xybitmap(DrawablePtr drawable, GCPtr gc,
if (!glamor_set_planemask(pixmap, gc->planemask)) if (!glamor_set_planemask(pixmap, gc->planemask))
goto fail; goto fail;
dispatch->glUseProgram(glamor_priv->put_image_xybitmap_prog); glUseProgram(glamor_priv->put_image_xybitmap_prog);
glamor_get_color_4f_from_pixel(pixmap, gc->fgPixel, fg); glamor_get_color_4f_from_pixel(pixmap, gc->fgPixel, fg);
dispatch->glUniform4fv glUniform4fv(glamor_priv->put_image_xybitmap_fg_uniform_location, 1, fg);
(glamor_priv->put_image_xybitmap_fg_uniform_location, 1, fg);
glamor_get_color_4f_from_pixel(pixmap, gc->bgPixel, bg); glamor_get_color_4f_from_pixel(pixmap, gc->bgPixel, bg);
dispatch->glUniform4fv glUniform4fv(glamor_priv->put_image_xybitmap_bg_uniform_location, 1, bg);
(glamor_priv->put_image_xybitmap_bg_uniform_location, 1, bg);
dispatch->glGenTextures(1, &tex); glGenTextures(1, &tex);
dispatch->glActiveTexture(GL_TEXTURE0); glActiveTexture(GL_TEXTURE0);
dispatch->glEnable(GL_TEXTURE_2D); glBindTexture(GL_TEXTURE_2D, tex);
dispatch->glBindTexture(GL_TEXTURE_2D, tex); glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST);
dispatch->glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST); glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
dispatch->glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST); glPixelStorei(GL_UNPACK_ALIGNMENT, 1);
dispatch->glPixelStorei(GL_UNPACK_ALIGNMENT, 1); glPixelStorei(GL_UNPACK_ROW_LENGTH, stride * 8);
dispatch->glPixelStorei(GL_UNPACK_ROW_LENGTH, stride * 8); glPixelStorei(GL_UNPACK_SKIP_PIXELS, left_pad);
dispatch->glPixelStorei(GL_UNPACK_SKIP_PIXELS, left_pad); glTexImage2D(GL_TEXTURE_2D, 0, GL_ALPHA,
dispatch->glTexImage2D(GL_TEXTURE_2D, 0, GL_ALPHA, w, h, 0, GL_COLOR_INDEX, GL_BITMAP, bits);
w, h, 0, GL_COLOR_INDEX, GL_BITMAP, bits); glPixelStorei(GL_UNPACK_ROW_LENGTH, 0);
dispatch->glPixelStorei(GL_UNPACK_ROW_LENGTH, 0); glPixelStorei(GL_UNPACK_SKIP_PIXELS, 0);
dispatch->glPixelStorei(GL_UNPACK_SKIP_PIXELS, 0);
/* Now that we've set up our bitmap texture and the shader, shove /* Now that we've set up our bitmap texture and the shader, shove
* the destination rectangle through the cliprects and run the * the destination rectangle through the cliprects and run the
* shader on the resulting fragments. * shader on the resulting fragments.
*/ */
dispatch->glVertexPointer(2, GL_FLOAT, 0, dest_coords); glVertexPointer(2, GL_FLOAT, 0, dest_coords);
dispatch->glEnableClientState(GL_VERTEX_ARRAY); glEnableClientState(GL_VERTEX_ARRAY);
dispatch->glClientActiveTexture(GL_TEXTURE0); glClientActiveTexture(GL_TEXTURE0);
dispatch->glTexCoordPointer(2, GL_FLOAT, 0, bitmap_coords); glTexCoordPointer(2, GL_FLOAT, 0, bitmap_coords);
dispatch->glEnableClientState(GL_TEXTURE_COORD_ARRAY); glEnableClientState(GL_TEXTURE_COORD_ARRAY);
dispatch->glEnable(GL_SCISSOR_TEST); glEnable(GL_SCISSOR_TEST);
clip = fbGetCompositeClip(gc); clip = fbGetCompositeClip(gc);
for (nbox = REGION_NUM_RECTS(clip), box = REGION_RECTS(clip); nbox--; box++) { for (nbox = REGION_NUM_RECTS(clip), box = REGION_RECTS(clip); nbox--; box++) {
int x1 = x; int x1 = x;
@ -214,19 +210,17 @@ glamor_put_image_xybitmap(DrawablePtr drawable, GCPtr gc,
if (x1 >= x2 || y1 >= y2) if (x1 >= x2 || y1 >= y2)
continue; continue;
dispatch->glScissor(box->x1, glScissor(box->x1, y_flip(pixmap, box->y1),
y_flip(pixmap, box->y1), box->x2 - box->x1, box->y2 - box->y1);
box->x2 - box->x1, box->y2 - box->y1); glDrawArrays(GL_QUADS, 0, 4);
dispatch->glDrawArrays(GL_QUADS, 0, 4);
} }
dispatch->glDisable(GL_SCISSOR_TEST); glDisable(GL_SCISSOR_TEST);
glamor_set_alu(GXcopy); glamor_set_alu(GXcopy);
glamor_set_planemask(pixmap, ~0); glamor_set_planemask(pixmap, ~0);
dispatch->glDeleteTextures(1, &tex); glDeleteTextures(1, &tex);
dispatch->glDisable(GL_TEXTURE_2D); glDisableClientState(GL_VERTEX_ARRAY);
dispatch->glDisableClientState(GL_VERTEX_ARRAY); glDisableClientState(GL_TEXTURE_COORD_ARRAY);
dispatch->glDisableClientState(GL_TEXTURE_COORD_ARRAY);
return; return;
glamor_set_alu(GXcopy); glamor_set_alu(GXcopy);
glamor_set_planemask(pixmap, ~0); glamor_set_planemask(pixmap, ~0);

317
glamor/glamor_render.c
View File

@ -62,8 +62,7 @@ static struct blendinfo composite_op_info[] = {
#define RepeatFix 10 #define RepeatFix 10
static GLuint static GLuint
glamor_create_composite_fs(glamor_gl_dispatch *dispatch, glamor_create_composite_fs(struct shader_key *key)
struct shader_key *key)
{ {
const char *repeat_define = const char *repeat_define =
"#define RepeatNone 0\n" "#define RepeatNone 0\n"
@ -266,15 +265,14 @@ glamor_create_composite_fs(glamor_gl_dispatch *dispatch,
XNFasprintf(&source, "%s%s%s%s%s%s", repeat_define, relocate_texture, XNFasprintf(&source, "%s%s%s%s%s%s", repeat_define, relocate_texture,
rel_sampler, source_fetch, mask_fetch, in); rel_sampler, source_fetch, mask_fetch, in);
prog = glamor_compile_glsl_prog(dispatch, GL_FRAGMENT_SHADER, source); prog = glamor_compile_glsl_prog(GL_FRAGMENT_SHADER, source);
free(source); free(source);
return prog; return prog;
} }
static GLuint static GLuint
glamor_create_composite_vs(glamor_gl_dispatch *dispatch, glamor_create_composite_vs(struct shader_key *key)
struct shader_key *key)
{ {
const char *main_opening = const char *main_opening =
"attribute vec4 v_position;\n" "attribute vec4 v_position;\n"
@ -304,7 +302,7 @@ glamor_create_composite_vs(glamor_gl_dispatch *dispatch,
main_opening, main_opening,
source_coords_setup, mask_coords_setup, main_closing); source_coords_setup, mask_coords_setup, main_closing);
prog = glamor_compile_glsl_prog(dispatch, GL_VERTEX_SHADER, source); prog = glamor_compile_glsl_prog(GL_VERTEX_SHADER, source);
free(source); free(source);
return prog; return prog;
@ -317,60 +315,57 @@ glamor_create_composite_shader(ScreenPtr screen, struct shader_key *key,
GLuint vs, fs, prog; GLuint vs, fs, prog;
GLint source_sampler_uniform_location, mask_sampler_uniform_location; GLint source_sampler_uniform_location, mask_sampler_uniform_location;
glamor_screen_private *glamor_priv = glamor_get_screen_private(screen); glamor_screen_private *glamor_priv = glamor_get_screen_private(screen);
glamor_gl_dispatch *dispatch;
dispatch = glamor_get_dispatch(glamor_priv); glamor_get_context(glamor_priv);
vs = glamor_create_composite_vs(dispatch, key); vs = glamor_create_composite_vs(key);
if (vs == 0) if (vs == 0)
goto out; goto out;
fs = glamor_create_composite_fs(dispatch, key); fs = glamor_create_composite_fs(key);
if (fs == 0) if (fs == 0)
goto out; goto out;
prog = dispatch->glCreateProgram(); prog = glCreateProgram();
dispatch->glAttachShader(prog, vs); glAttachShader(prog, vs);
dispatch->glAttachShader(prog, fs); glAttachShader(prog, fs);
dispatch->glBindAttribLocation(prog, GLAMOR_VERTEX_POS, "v_position"); glBindAttribLocation(prog, GLAMOR_VERTEX_POS, "v_position");
dispatch->glBindAttribLocation(prog, GLAMOR_VERTEX_SOURCE, "v_texcoord0"); glBindAttribLocation(prog, GLAMOR_VERTEX_SOURCE, "v_texcoord0");
dispatch->glBindAttribLocation(prog, GLAMOR_VERTEX_MASK, "v_texcoord1"); glBindAttribLocation(prog, GLAMOR_VERTEX_MASK, "v_texcoord1");
glamor_link_glsl_prog(dispatch, prog); glamor_link_glsl_prog(prog);
shader->prog = prog; shader->prog = prog;
dispatch->glUseProgram(prog); glUseProgram(prog);
if (key->source == SHADER_SOURCE_SOLID) { if (key->source == SHADER_SOURCE_SOLID) {
shader->source_uniform_location = shader->source_uniform_location = glGetUniformLocation(prog, "source");
dispatch->glGetUniformLocation(prog, "source");
} }
else { else {
source_sampler_uniform_location = source_sampler_uniform_location =
dispatch->glGetUniformLocation(prog, "source_sampler"); glGetUniformLocation(prog, "source_sampler");
dispatch->glUniform1i(source_sampler_uniform_location, 0); glUniform1i(source_sampler_uniform_location, 0);
shader->source_wh = dispatch->glGetUniformLocation(prog, "source_wh"); shader->source_wh = glGetUniformLocation(prog, "source_wh");
shader->source_repeat_mode = shader->source_repeat_mode =
dispatch->glGetUniformLocation(prog, "source_repeat_mode"); glGetUniformLocation(prog, "source_repeat_mode");
} }
if (key->mask != SHADER_MASK_NONE) { if (key->mask != SHADER_MASK_NONE) {
if (key->mask == SHADER_MASK_SOLID) { if (key->mask == SHADER_MASK_SOLID) {
shader->mask_uniform_location = shader->mask_uniform_location = glGetUniformLocation(prog, "mask");
dispatch->glGetUniformLocation(prog, "mask");
} }
else { else {
mask_sampler_uniform_location = mask_sampler_uniform_location =
dispatch->glGetUniformLocation(prog, "mask_sampler"); glGetUniformLocation(prog, "mask_sampler");
dispatch->glUniform1i(mask_sampler_uniform_location, 1); glUniform1i(mask_sampler_uniform_location, 1);
shader->mask_wh = dispatch->glGetUniformLocation(prog, "mask_wh"); shader->mask_wh = glGetUniformLocation(prog, "mask_wh");
shader->mask_repeat_mode = shader->mask_repeat_mode =
dispatch->glGetUniformLocation(prog, "mask_repeat_mode"); glGetUniformLocation(prog, "mask_repeat_mode");
} }
} }
out: out:
glamor_put_dispatch(glamor_priv); glamor_put_context(glamor_priv);
} }
static glamor_composite_shader * static glamor_composite_shader *
@ -407,23 +402,21 @@ void
glamor_init_composite_shaders(ScreenPtr screen) glamor_init_composite_shaders(ScreenPtr screen)
{ {
glamor_screen_private *glamor_priv; glamor_screen_private *glamor_priv;
glamor_gl_dispatch *dispatch;
unsigned short *eb; unsigned short *eb;
float *vb = NULL; float *vb = NULL;
int eb_size; int eb_size;
glamor_priv = glamor_get_screen_private(screen); glamor_priv = glamor_get_screen_private(screen);
dispatch = glamor_get_dispatch(glamor_priv); glamor_get_context(glamor_priv);
dispatch->glGenBuffers(1, &glamor_priv->vbo); glGenBuffers(1, &glamor_priv->vbo);
dispatch->glGenBuffers(1, &glamor_priv->ebo); glGenBuffers(1, &glamor_priv->ebo);
dispatch->glBindBuffer(GL_ELEMENT_ARRAY_BUFFER, glamor_priv->ebo); glBindBuffer(GL_ELEMENT_ARRAY_BUFFER, glamor_priv->ebo);
eb_size = GLAMOR_COMPOSITE_VBO_VERT_CNT * sizeof(short) * 2; eb_size = GLAMOR_COMPOSITE_VBO_VERT_CNT * sizeof(short) * 2;
if (glamor_priv->gl_flavor == GLAMOR_GL_DESKTOP) { if (glamor_priv->gl_flavor == GLAMOR_GL_DESKTOP) {
dispatch->glBufferData(GL_ELEMENT_ARRAY_BUFFER, glBufferData(GL_ELEMENT_ARRAY_BUFFER, eb_size, NULL, GL_STATIC_DRAW);
eb_size, NULL, GL_STATIC_DRAW); eb = glMapBuffer(GL_ELEMENT_ARRAY_BUFFER, GL_WRITE_ONLY);
eb = dispatch->glMapBuffer(GL_ELEMENT_ARRAY_BUFFER, GL_WRITE_ONLY);
} }
else { else {
vb = malloc(GLAMOR_COMPOSITE_VBO_VERT_CNT * sizeof(float) * 2); vb = malloc(GLAMOR_COMPOSITE_VBO_VERT_CNT * sizeof(float) * 2);
@ -438,51 +431,49 @@ glamor_init_composite_shaders(ScreenPtr screen)
glamor_init_eb(eb, GLAMOR_COMPOSITE_VBO_VERT_CNT); glamor_init_eb(eb, GLAMOR_COMPOSITE_VBO_VERT_CNT);
if (glamor_priv->gl_flavor == GLAMOR_GL_DESKTOP) { if (glamor_priv->gl_flavor == GLAMOR_GL_DESKTOP) {
dispatch->glUnmapBuffer(GL_ELEMENT_ARRAY_BUFFER); glUnmapBuffer(GL_ELEMENT_ARRAY_BUFFER);
dispatch->glBindBuffer(GL_ELEMENT_ARRAY_BUFFER, 0); glBindBuffer(GL_ELEMENT_ARRAY_BUFFER, 0);
} }
else { else {
dispatch->glBufferData(GL_ELEMENT_ARRAY_BUFFER, glBufferData(GL_ELEMENT_ARRAY_BUFFER, eb_size, eb, GL_STATIC_DRAW);
eb_size, eb, GL_STATIC_DRAW); glBindBuffer(GL_ELEMENT_ARRAY_BUFFER, 0);
dispatch->glBindBuffer(GL_ELEMENT_ARRAY_BUFFER, 0);
dispatch->glBindBuffer(GL_ARRAY_BUFFER, glamor_priv->vbo); glBindBuffer(GL_ARRAY_BUFFER, glamor_priv->vbo);
dispatch->glBufferData(GL_ARRAY_BUFFER, glBufferData(GL_ARRAY_BUFFER,
GLAMOR_COMPOSITE_VBO_VERT_CNT * sizeof(float) * GLAMOR_COMPOSITE_VBO_VERT_CNT * sizeof(float) *
2, NULL, GL_DYNAMIC_DRAW); 2, NULL, GL_DYNAMIC_DRAW);
dispatch->glBindBuffer(GL_ARRAY_BUFFER, 0); glBindBuffer(GL_ARRAY_BUFFER, 0);
free(eb); free(eb);
glamor_priv->vb = (char *) vb; glamor_priv->vb = (char *) vb;
} }
glamor_put_dispatch(glamor_priv); glamor_put_context(glamor_priv);
} }
void void
glamor_fini_composite_shaders(ScreenPtr screen) glamor_fini_composite_shaders(ScreenPtr screen)
{ {
glamor_screen_private *glamor_priv; glamor_screen_private *glamor_priv;
glamor_gl_dispatch *dispatch;
glamor_composite_shader *shader; glamor_composite_shader *shader;
int i, j, k; int i, j, k;
glamor_priv = glamor_get_screen_private(screen); glamor_priv = glamor_get_screen_private(screen);
dispatch = glamor_get_dispatch(glamor_priv); glamor_get_context(glamor_priv);
dispatch->glDeleteBuffers(1, &glamor_priv->vbo); glDeleteBuffers(1, &glamor_priv->vbo);
dispatch->glDeleteBuffers(1, &glamor_priv->ebo); glDeleteBuffers(1, &glamor_priv->ebo);
for (i = 0; i < SHADER_SOURCE_COUNT; i++) for (i = 0; i < SHADER_SOURCE_COUNT; i++)
for (j = 0; j < SHADER_MASK_COUNT; j++) for (j = 0; j < SHADER_MASK_COUNT; j++)
for (k = 0; k < SHADER_IN_COUNT; k++) { for (k = 0; k < SHADER_IN_COUNT; k++) {
shader = &glamor_priv->composite_shader[i][j][k]; shader = &glamor_priv->composite_shader[i][j][k];
if (shader->prog) if (shader->prog)
dispatch->glDeleteProgram(shader->prog); glDeleteProgram(shader->prog);
} }
if (glamor_priv->gl_flavor != GLAMOR_GL_DESKTOP && glamor_priv->vb) if (glamor_priv->gl_flavor != GLAMOR_GL_DESKTOP && glamor_priv->vb)
free(glamor_priv->vb); free(glamor_priv->vb);
glamor_put_dispatch(glamor_priv); glamor_put_context(glamor_priv);
} }
static Bool static Bool
@ -535,44 +526,37 @@ glamor_set_composite_texture(glamor_screen_private *glamor_priv, int unit,
glamor_pixmap_private *pixmap_priv, glamor_pixmap_private *pixmap_priv,
GLuint wh_location, GLuint repeat_location) GLuint wh_location, GLuint repeat_location)
{ {
glamor_gl_dispatch *dispatch;
float wh[4]; float wh[4];
int repeat_type; int repeat_type;
dispatch = glamor_get_dispatch(glamor_priv); glamor_get_context(glamor_priv);
dispatch->glActiveTexture(GL_TEXTURE0 + unit); glActiveTexture(GL_TEXTURE0 + unit);
dispatch->glBindTexture(GL_TEXTURE_2D, pixmap_priv->base.fbo->tex); glBindTexture(GL_TEXTURE_2D, pixmap_priv->base.fbo->tex);
repeat_type = picture->repeatType; repeat_type = picture->repeatType;
switch (picture->repeatType) { switch (picture->repeatType) {
case RepeatNone: case RepeatNone:
#ifndef GLAMOR_GLES2 if (glamor_priv->gl_flavor != GLAMOR_GL_ES2) {
/* XXX GLES2 doesn't support GL_CLAMP_TO_BORDER. */ /* XXX GLES2 doesn't support GL_CLAMP_TO_BORDER. */
dispatch->glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S,
GL_CLAMP_TO_BORDER); GL_CLAMP_TO_BORDER);
dispatch->glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T,
GL_CLAMP_TO_BORDER); GL_CLAMP_TO_BORDER);
#else } else {
dispatch->glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE);
GL_CLAMP_TO_EDGE); glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
dispatch->glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, }
GL_CLAMP_TO_EDGE);
#endif
break; break;
case RepeatNormal: case RepeatNormal:
dispatch->glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT); glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT);
dispatch->glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT); glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT);
break; break;
case RepeatPad: case RepeatPad:
dispatch->glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE);
GL_CLAMP_TO_EDGE); glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
dispatch->glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T,
GL_CLAMP_TO_EDGE);
break; break;
case RepeatReflect: case RepeatReflect:
dispatch->glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_MIRRORED_REPEAT);
GL_MIRRORED_REPEAT); glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_MIRRORED_REPEAT);
dispatch->glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T,
GL_MIRRORED_REPEAT);
break; break;
} }
@ -580,23 +564,16 @@ glamor_set_composite_texture(glamor_screen_private *glamor_priv, int unit,
default: default:
case PictFilterFast: case PictFilterFast:
case PictFilterNearest: case PictFilterNearest:
dispatch->glTexParameteri(GL_TEXTURE_2D, glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST);
GL_TEXTURE_MIN_FILTER, GL_NEAREST); glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
dispatch->glTexParameteri(GL_TEXTURE_2D,
GL_TEXTURE_MAG_FILTER, GL_NEAREST);
break; break;
case PictFilterGood: case PictFilterGood:
case PictFilterBest: case PictFilterBest:
case PictFilterBilinear: case PictFilterBilinear:
dispatch->glTexParameteri(GL_TEXTURE_2D, glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
GL_TEXTURE_MIN_FILTER, GL_LINEAR); glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
dispatch->glTexParameteri(GL_TEXTURE_2D,
GL_TEXTURE_MAG_FILTER, GL_LINEAR);
break; break;
} }
#ifndef GLAMOR_GLES2
dispatch->glEnable(GL_TEXTURE_2D);
#endif
/* /*
* GLES2 doesn't support RepeatNone. We need to fix it anyway. * GLES2 doesn't support RepeatNone. We need to fix it anyway.
@ -615,19 +592,18 @@ glamor_set_composite_texture(glamor_screen_private *glamor_priv, int unit,
if ((wh[0] != 1.0 || wh[1] != 1.0) if ((wh[0] != 1.0 || wh[1] != 1.0)
|| (glamor_priv->gl_flavor == GLAMOR_GL_ES2 || (glamor_priv->gl_flavor == GLAMOR_GL_ES2
&& repeat_type == RepeatFix)) && repeat_type == RepeatFix))
dispatch->glUniform4fv(wh_location, 1, wh); glUniform4fv(wh_location, 1, wh);
else else
repeat_type -= RepeatFix; repeat_type -= RepeatFix;
} }
dispatch->glUniform1i(repeat_location, repeat_type); glUniform1i(repeat_location, repeat_type);
glamor_put_dispatch(glamor_priv); glamor_put_context(glamor_priv);
} }
static void static void
glamor_set_composite_solid(glamor_gl_dispatch *dispatch, float *color, glamor_set_composite_solid(float *color, GLint uniform_location)
GLint uniform_location)
{ {
dispatch->glUniform4fv(uniform_location, 1, color); glUniform4fv(uniform_location, 1, color);
} }
static int static int
@ -729,7 +705,6 @@ void
glamor_setup_composite_vbo(ScreenPtr screen, int n_verts) glamor_setup_composite_vbo(ScreenPtr screen, int n_verts)
{ {
glamor_screen_private *glamor_priv = glamor_get_screen_private(screen); glamor_screen_private *glamor_priv = glamor_get_screen_private(screen);
glamor_gl_dispatch *dispatch;
int vert_size; int vert_size;
glamor_priv->render_nr_verts = 0; glamor_priv->render_nr_verts = 0;
@ -741,65 +716,54 @@ glamor_setup_composite_vbo(ScreenPtr screen, int n_verts)
vert_size = n_verts * glamor_priv->vb_stride; vert_size = n_verts * glamor_priv->vb_stride;
dispatch = glamor_get_dispatch(glamor_priv); glamor_get_context(glamor_priv);
dispatch->glBindBuffer(GL_ARRAY_BUFFER, glamor_priv->vbo); glBindBuffer(GL_ARRAY_BUFFER, glamor_priv->vbo);
if (glamor_priv->gl_flavor == GLAMOR_GL_DESKTOP) { if (glamor_priv->gl_flavor == GLAMOR_GL_DESKTOP) {
if (glamor_priv->vbo_size < (glamor_priv->vbo_offset + vert_size)) { if (glamor_priv->vbo_size < (glamor_priv->vbo_offset + vert_size)) {
glamor_priv->vbo_size = GLAMOR_COMPOSITE_VBO_VERT_CNT * glamor_priv->vbo_size = GLAMOR_COMPOSITE_VBO_VERT_CNT *
glamor_priv->vb_stride; glamor_priv->vb_stride;
glamor_priv->vbo_offset = 0; glamor_priv->vbo_offset = 0;
dispatch->glBufferData(GL_ARRAY_BUFFER, glBufferData(GL_ARRAY_BUFFER,
glamor_priv->vbo_size, NULL, GL_STREAM_DRAW); glamor_priv->vbo_size, NULL, GL_STREAM_DRAW);
} }
glamor_priv->vb = dispatch->glMapBufferRange(GL_ARRAY_BUFFER, glamor_priv->vb = glMapBufferRange(GL_ARRAY_BUFFER,
glamor_priv->vbo_offset, glamor_priv->vbo_offset,
vert_size, vert_size,
GL_MAP_WRITE_BIT | GL_MAP_WRITE_BIT |
GL_MAP_UNSYNCHRONIZED_BIT); GL_MAP_UNSYNCHRONIZED_BIT);
assert(glamor_priv->vb != NULL); assert(glamor_priv->vb != NULL);
glamor_priv->vb -= glamor_priv->vbo_offset; glamor_priv->vb -= glamor_priv->vbo_offset;
} }
else else
glamor_priv->vbo_offset = 0; glamor_priv->vbo_offset = 0;
dispatch->glBindBuffer(GL_ELEMENT_ARRAY_BUFFER, glamor_priv->ebo); glBindBuffer(GL_ELEMENT_ARRAY_BUFFER, glamor_priv->ebo);
dispatch->glVertexAttribPointer(GLAMOR_VERTEX_POS, 2, GL_FLOAT, glVertexAttribPointer(GLAMOR_VERTEX_POS, 2, GL_FLOAT, GL_FALSE,
GL_FALSE, glamor_priv->vb_stride, glamor_priv->vb_stride,
(void *) ((long) (void *) ((long)
glamor_priv->vbo_offset)); glamor_priv->vbo_offset));
dispatch->glEnableVertexAttribArray(GLAMOR_VERTEX_POS); glEnableVertexAttribArray(GLAMOR_VERTEX_POS);
if (glamor_priv->has_source_coords) { if (glamor_priv->has_source_coords) {
dispatch->glVertexAttribPointer(GLAMOR_VERTEX_SOURCE, 2, glVertexAttribPointer(GLAMOR_VERTEX_SOURCE, 2,
GL_FLOAT, GL_FALSE, GL_FLOAT, GL_FALSE,
glamor_priv->vb_stride, (void *) ((long) glamor_priv->vb_stride,
glamor_priv-> (void *) ((long) glamor_priv->vbo_offset +
vbo_offset 2 * sizeof(float)));
+ glEnableVertexAttribArray(GLAMOR_VERTEX_SOURCE);
2 *
sizeof
(float)));
dispatch->glEnableVertexAttribArray(GLAMOR_VERTEX_SOURCE);
} }
if (glamor_priv->has_mask_coords) { if (glamor_priv->has_mask_coords) {
dispatch->glVertexAttribPointer(GLAMOR_VERTEX_MASK, 2, glVertexAttribPointer(GLAMOR_VERTEX_MASK, 2, GL_FLOAT, GL_FALSE,
GL_FLOAT, GL_FALSE, glamor_priv->vb_stride,
glamor_priv->vb_stride, (void *) ((long) (void *) ((long) glamor_priv->vbo_offset +
glamor_priv-> (glamor_priv->has_source_coords ?
vbo_offset 4 : 2) * sizeof(float)));
+ glEnableVertexAttribArray(GLAMOR_VERTEX_MASK);
(glamor_priv->
has_source_coords
? 4 :
2) *
sizeof
(float)));
dispatch->glEnableVertexAttribArray(GLAMOR_VERTEX_MASK);
} }
glamor_put_dispatch(glamor_priv); glamor_put_context(glamor_priv);
} }
void void
@ -831,32 +795,29 @@ static void
glamor_flush_composite_rects(ScreenPtr screen) glamor_flush_composite_rects(ScreenPtr screen)
{ {
glamor_screen_private *glamor_priv = glamor_get_screen_private(screen); glamor_screen_private *glamor_priv = glamor_get_screen_private(screen);
glamor_gl_dispatch *dispatch;
dispatch = glamor_get_dispatch(glamor_priv); glamor_get_context(glamor_priv);
if (glamor_priv->gl_flavor == GLAMOR_GL_DESKTOP) if (glamor_priv->gl_flavor == GLAMOR_GL_DESKTOP)
dispatch->glUnmapBuffer(GL_ARRAY_BUFFER); glUnmapBuffer(GL_ARRAY_BUFFER);
else { else {
dispatch->glBindBuffer(GL_ARRAY_BUFFER, glamor_priv->vbo); glBindBuffer(GL_ARRAY_BUFFER, glamor_priv->vbo);
dispatch->glBufferData(GL_ARRAY_BUFFER, glBufferData(GL_ARRAY_BUFFER, glamor_priv->vbo_offset,
glamor_priv->vbo_offset, glamor_priv->vb, GL_DYNAMIC_DRAW);
glamor_priv->vb, GL_DYNAMIC_DRAW);
} }
if (!glamor_priv->render_nr_verts) if (!glamor_priv->render_nr_verts)
return; return;
#ifndef GLAMOR_GLES2 if (glamor_priv->gl_flavor == GLAMOR_GL_DESKTOP) {
dispatch->glDrawRangeElements(GL_TRIANGLES, 0, glamor_priv->render_nr_verts, glDrawRangeElements(GL_TRIANGLES, 0, glamor_priv->render_nr_verts,
(glamor_priv->render_nr_verts * 3) / 2, (glamor_priv->render_nr_verts * 3) / 2,
GL_UNSIGNED_SHORT, NULL); GL_UNSIGNED_SHORT, NULL);
#else } else {
dispatch->glDrawElements(GL_TRIANGLES, glDrawElements(GL_TRIANGLES, (glamor_priv->render_nr_verts * 3) / 2,
(glamor_priv->render_nr_verts * 3) / 2, GL_UNSIGNED_SHORT, NULL);
GL_UNSIGNED_SHORT, NULL); }
#endif glamor_put_context(glamor_priv);
glamor_put_dispatch(glamor_priv);
} }
int pict_format_combine_tab[][3] = { int pict_format_combine_tab[][3] = {
@ -1228,17 +1189,15 @@ glamor_composite_set_shader_blend(glamor_pixmap_private *dest_priv,
glamor_composite_shader *shader, glamor_composite_shader *shader,
struct blendinfo *op_info) struct blendinfo *op_info)
{ {
glamor_gl_dispatch *dispatch;
glamor_screen_private *glamor_priv; glamor_screen_private *glamor_priv;
glamor_priv = dest_priv->base.glamor_priv; glamor_priv = dest_priv->base.glamor_priv;
dispatch = glamor_get_dispatch(glamor_priv); glamor_get_context(glamor_priv);
dispatch->glUseProgram(shader->prog); glUseProgram(shader->prog);
if (key->source == SHADER_SOURCE_SOLID) { if (key->source == SHADER_SOURCE_SOLID) {
glamor_set_composite_solid(dispatch, glamor_set_composite_solid(shader->source_solid_color,
shader->source_solid_color,
shader->source_uniform_location); shader->source_uniform_location);
} }
else { else {
@ -1250,8 +1209,7 @@ glamor_composite_set_shader_blend(glamor_pixmap_private *dest_priv,
if (key->mask != SHADER_MASK_NONE) { if (key->mask != SHADER_MASK_NONE) {
if (key->mask == SHADER_MASK_SOLID) { if (key->mask == SHADER_MASK_SOLID) {
glamor_set_composite_solid(dispatch, glamor_set_composite_solid(shader->mask_solid_color,
shader->mask_solid_color,
shader->mask_uniform_location); shader->mask_uniform_location);
} }
else { else {
@ -1263,14 +1221,14 @@ glamor_composite_set_shader_blend(glamor_pixmap_private *dest_priv,
} }
if (op_info->source_blend == GL_ONE && op_info->dest_blend == GL_ZERO) { if (op_info->source_blend == GL_ONE && op_info->dest_blend == GL_ZERO) {
dispatch->glDisable(GL_BLEND); glDisable(GL_BLEND);
} }
else { else {
dispatch->glEnable(GL_BLEND); glEnable(GL_BLEND);
dispatch->glBlendFunc(op_info->source_blend, op_info->dest_blend); glBlendFunc(op_info->source_blend, op_info->dest_blend);
} }
glamor_put_dispatch(glamor_priv); glamor_put_context(glamor_priv);
} }
static Bool static Bool
@ -1289,7 +1247,6 @@ glamor_composite_with_shader(CARD8 op,
PixmapPtr dest_pixmap = dest_pixmap_priv->base.pixmap; PixmapPtr dest_pixmap = dest_pixmap_priv->base.pixmap;
PixmapPtr source_pixmap = NULL; PixmapPtr source_pixmap = NULL;
PixmapPtr mask_pixmap = NULL; PixmapPtr mask_pixmap = NULL;
glamor_gl_dispatch *dispatch = NULL;
GLfloat dst_xscale, dst_yscale; GLfloat dst_xscale, dst_yscale;
GLfloat mask_xscale = 1, mask_yscale = 1, src_xscale = 1, src_yscale = 1; GLfloat mask_xscale = 1, mask_yscale = 1, src_xscale = 1, src_yscale = 1;
struct shader_key key, key_ca; struct shader_key key, key_ca;
@ -1328,7 +1285,7 @@ glamor_composite_with_shader(CARD8 op,
glamor_set_destination_pixmap_priv_nc(dest_pixmap_priv); glamor_set_destination_pixmap_priv_nc(dest_pixmap_priv);
glamor_composite_set_shader_blend(dest_pixmap_priv, &key, shader, &op_info); glamor_composite_set_shader_blend(dest_pixmap_priv, &key, shader, &op_info);
dispatch = glamor_get_dispatch(glamor_priv); glamor_get_context(glamor_priv);
glamor_priv->has_source_coords = key.source != SHADER_SOURCE_SOLID; glamor_priv->has_source_coords = key.source != SHADER_SOURCE_SOLID;
glamor_priv->has_mask_coords = (key.mask != SHADER_MASK_NONE && glamor_priv->has_mask_coords = (key.mask != SHADER_MASK_NONE &&
@ -1445,25 +1402,19 @@ glamor_composite_with_shader(CARD8 op,
} }
} }
dispatch->glBindBuffer(GL_ARRAY_BUFFER, 0); glBindBuffer(GL_ARRAY_BUFFER, 0);
dispatch->glBindBuffer(GL_ELEMENT_ARRAY_BUFFER, 0); glBindBuffer(GL_ELEMENT_ARRAY_BUFFER, 0);
dispatch->glDisableVertexAttribArray(GLAMOR_VERTEX_POS); glDisableVertexAttribArray(GLAMOR_VERTEX_POS);
dispatch->glDisableVertexAttribArray(GLAMOR_VERTEX_SOURCE); glDisableVertexAttribArray(GLAMOR_VERTEX_SOURCE);
dispatch->glDisableVertexAttribArray(GLAMOR_VERTEX_MASK); glDisableVertexAttribArray(GLAMOR_VERTEX_MASK);
dispatch->glDisable(GL_BLEND); glDisable(GL_BLEND);
#ifndef GLAMOR_GLES2
dispatch->glActiveTexture(GL_TEXTURE0);
dispatch->glDisable(GL_TEXTURE_2D);
dispatch->glActiveTexture(GL_TEXTURE1);
dispatch->glDisable(GL_TEXTURE_2D);
#endif
DEBUGF("finish rendering.\n"); DEBUGF("finish rendering.\n");
dispatch->glUseProgram(0); glUseProgram(0);
glamor_priv->state = RENDER_STATE; glamor_priv->state = RENDER_STATE;
glamor_priv->render_idle_cnt = 0; glamor_priv->render_idle_cnt = 0;
if (saved_source_format) if (saved_source_format)
source->format = saved_source_format; source->format = saved_source_format;
glamor_put_dispatch(glamor_priv); glamor_put_context(glamor_priv);
ret = TRUE; ret = TRUE;
return ret; return ret;

101
glamor/glamor_tile.c
View File

@ -37,7 +37,6 @@ void
glamor_init_tile_shader(ScreenPtr screen) glamor_init_tile_shader(ScreenPtr screen)
{ {
glamor_screen_private *glamor_priv; glamor_screen_private *glamor_priv;
glamor_gl_dispatch *dispatch;
const char *tile_vs = const char *tile_vs =
"attribute vec4 v_position;\n" "attribute vec4 v_position;\n"
"attribute vec4 v_texcoord0;\n" "attribute vec4 v_texcoord0;\n"
@ -63,40 +62,39 @@ glamor_init_tile_shader(ScreenPtr screen)
GLint sampler_uniform_location; GLint sampler_uniform_location;
glamor_priv = glamor_get_screen_private(screen); glamor_priv = glamor_get_screen_private(screen);
dispatch = glamor_get_dispatch(glamor_priv); glamor_get_context(glamor_priv);
glamor_priv->tile_prog = dispatch->glCreateProgram(); glamor_priv->tile_prog = glCreateProgram();
vs_prog = glamor_compile_glsl_prog(dispatch, GL_VERTEX_SHADER, tile_vs); vs_prog = glamor_compile_glsl_prog(GL_VERTEX_SHADER, tile_vs);
fs_prog = glamor_compile_glsl_prog(dispatch, GL_FRAGMENT_SHADER, tile_fs); fs_prog = glamor_compile_glsl_prog(GL_FRAGMENT_SHADER, tile_fs);
dispatch->glAttachShader(glamor_priv->tile_prog, vs_prog); glAttachShader(glamor_priv->tile_prog, vs_prog);
dispatch->glAttachShader(glamor_priv->tile_prog, fs_prog); glAttachShader(glamor_priv->tile_prog, fs_prog);
dispatch->glBindAttribLocation(glamor_priv->tile_prog, glBindAttribLocation(glamor_priv->tile_prog,
GLAMOR_VERTEX_POS, "v_position"); GLAMOR_VERTEX_POS, "v_position");
dispatch->glBindAttribLocation(glamor_priv->tile_prog, glBindAttribLocation(glamor_priv->tile_prog,
GLAMOR_VERTEX_SOURCE, "v_texcoord0"); GLAMOR_VERTEX_SOURCE, "v_texcoord0");
glamor_link_glsl_prog(dispatch, glamor_priv->tile_prog); glamor_link_glsl_prog(glamor_priv->tile_prog);
sampler_uniform_location = sampler_uniform_location =
dispatch->glGetUniformLocation(glamor_priv->tile_prog, "sampler"); glGetUniformLocation(glamor_priv->tile_prog, "sampler");
dispatch->glUseProgram(glamor_priv->tile_prog); glUseProgram(glamor_priv->tile_prog);
dispatch->glUniform1i(sampler_uniform_location, 0); glUniform1i(sampler_uniform_location, 0);
glamor_priv->tile_wh = glamor_priv->tile_wh =
dispatch->glGetUniformLocation(glamor_priv->tile_prog, "wh"); glGetUniformLocation(glamor_priv->tile_prog, "wh");
dispatch->glUseProgram(0); glUseProgram(0);
glamor_put_dispatch(glamor_priv); glamor_put_context(glamor_priv);
} }
void void
glamor_fini_tile_shader(ScreenPtr screen) glamor_fini_tile_shader(ScreenPtr screen)
{ {
glamor_screen_private *glamor_priv; glamor_screen_private *glamor_priv;
glamor_gl_dispatch *dispatch;
glamor_priv = glamor_get_screen_private(screen); glamor_priv = glamor_get_screen_private(screen);
dispatch = glamor_get_dispatch(glamor_priv); glamor_get_context(glamor_priv);
dispatch->glDeleteProgram(glamor_priv->tile_prog); glDeleteProgram(glamor_priv->tile_prog);
glamor_put_dispatch(glamor_priv); glamor_put_context(glamor_priv);
} }
static void static void
@ -105,7 +103,6 @@ _glamor_tile(PixmapPtr pixmap, PixmapPtr tile,
{ {
ScreenPtr screen = pixmap->drawable.pScreen; ScreenPtr screen = pixmap->drawable.pScreen;
glamor_screen_private *glamor_priv = glamor_get_screen_private(screen); glamor_screen_private *glamor_priv = glamor_get_screen_private(screen);
glamor_gl_dispatch *dispatch;
int x1 = x; int x1 = x;
int x2 = x + width; int x2 = x + width;
int y1 = y; int y1 = y;
@ -127,47 +124,40 @@ _glamor_tile(PixmapPtr pixmap, PixmapPtr tile,
glamor_set_destination_pixmap_priv_nc(dst_pixmap_priv); glamor_set_destination_pixmap_priv_nc(dst_pixmap_priv);
pixmap_priv_get_dest_scale(dst_pixmap_priv, &dst_xscale, &dst_yscale); pixmap_priv_get_dest_scale(dst_pixmap_priv, &dst_xscale, &dst_yscale);
pixmap_priv_get_scale(src_pixmap_priv, &src_xscale, &src_yscale); pixmap_priv_get_scale(src_pixmap_priv, &src_xscale, &src_yscale);
dispatch = glamor_get_dispatch(glamor_priv); glamor_get_context(glamor_priv);
dispatch->glUseProgram(glamor_priv->tile_prog); glUseProgram(glamor_priv->tile_prog);
glamor_pixmap_fbo_fix_wh_ratio(wh, src_pixmap_priv); glamor_pixmap_fbo_fix_wh_ratio(wh, src_pixmap_priv);
dispatch->glUniform2fv(glamor_priv->tile_wh, 1, wh); glUniform2fv(glamor_priv->tile_wh, 1, wh);
dispatch->glActiveTexture(GL_TEXTURE0); glActiveTexture(GL_TEXTURE0);
dispatch->glBindTexture(GL_TEXTURE_2D, src_pixmap_priv->base.fbo->tex); glBindTexture(GL_TEXTURE_2D, src_pixmap_priv->base.fbo->tex);
dispatch->glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST); glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST);
dispatch->glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST); glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
dispatch->glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT); glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT);
dispatch->glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT); glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT);
#ifndef GLAMOR_GLES2
dispatch->glEnable(GL_TEXTURE_2D);
#endif
glamor_set_repeat_normalize_tcoords glamor_set_repeat_normalize_tcoords
(src_pixmap_priv, RepeatNormal, (src_pixmap_priv, RepeatNormal,
src_xscale, src_yscale, src_xscale, src_yscale,
tile_x1, tile_y1, tile_x1, tile_y1,
tile_x2, tile_y2, glamor_priv->yInverted, source_texcoords); tile_x2, tile_y2, glamor_priv->yInverted, source_texcoords);
dispatch->glVertexAttribPointer(GLAMOR_VERTEX_SOURCE, 2, glVertexAttribPointer(GLAMOR_VERTEX_SOURCE, 2, GL_FLOAT, GL_FALSE,
GL_FLOAT, GL_FALSE, 2 * sizeof(float), source_texcoords);
2 * sizeof(float), source_texcoords); glEnableVertexAttribArray(GLAMOR_VERTEX_SOURCE);
dispatch->glEnableVertexAttribArray(GLAMOR_VERTEX_SOURCE);
glamor_set_normalize_vcoords(dst_pixmap_priv, dst_xscale, dst_yscale, glamor_set_normalize_vcoords(dst_pixmap_priv, dst_xscale, dst_yscale,
x1, y1, x1, y1,
x2, y2, glamor_priv->yInverted, vertices); x2, y2, glamor_priv->yInverted, vertices);
dispatch->glVertexAttribPointer(GLAMOR_VERTEX_POS, 2, GL_FLOAT, glVertexAttribPointer(GLAMOR_VERTEX_POS, 2, GL_FLOAT, GL_FALSE,
GL_FALSE, 2 * sizeof(float), vertices); 2 * sizeof(float), vertices);
dispatch->glEnableVertexAttribArray(GLAMOR_VERTEX_POS); glEnableVertexAttribArray(GLAMOR_VERTEX_POS);
dispatch->glDrawArrays(GL_TRIANGLE_FAN, 0, 4); glDrawArrays(GL_TRIANGLE_FAN, 0, 4);
dispatch->glDisableVertexAttribArray(GLAMOR_VERTEX_SOURCE); glDisableVertexAttribArray(GLAMOR_VERTEX_SOURCE);
#ifndef GLAMOR_GLES2 glDisableVertexAttribArray(GLAMOR_VERTEX_POS);
dispatch->glDisable(GL_TEXTURE_2D); glUseProgram(0);
#endif glamor_put_context(glamor_priv);
dispatch->glDisableVertexAttribArray(GLAMOR_VERTEX_POS);
dispatch->glUseProgram(0);
glamor_put_dispatch(glamor_priv);
glamor_priv->state = RENDER_STATE; glamor_priv->state = RENDER_STATE;
glamor_priv->render_idle_cnt = 0; glamor_priv->render_idle_cnt = 0;
@ -182,7 +172,6 @@ glamor_tile(PixmapPtr pixmap, PixmapPtr tile,
glamor_screen_private *glamor_priv = glamor_get_screen_private(screen); glamor_screen_private *glamor_priv = glamor_get_screen_private(screen);
glamor_pixmap_private *dst_pixmap_priv; glamor_pixmap_private *dst_pixmap_priv;
glamor_pixmap_private *src_pixmap_priv; glamor_pixmap_private *src_pixmap_priv;
glamor_gl_dispatch *dispatch;
dst_pixmap_priv = glamor_get_pixmap_private(pixmap); dst_pixmap_priv = glamor_get_pixmap_private(pixmap);
src_pixmap_priv = glamor_get_pixmap_private(tile); src_pixmap_priv = glamor_get_pixmap_private(tile);
@ -206,10 +195,10 @@ glamor_tile(PixmapPtr pixmap, PixmapPtr tile,
goto fail; goto fail;
} }
dispatch = glamor_get_dispatch(glamor_priv); glamor_get_context(glamor_priv);
if (!glamor_set_alu(dispatch, alu)) { if (!glamor_set_alu(screen, alu)) {
glamor_fallback("unsupported alu %x\n", alu); glamor_fallback("unsupported alu %x\n", alu);
glamor_put_dispatch(glamor_priv); glamor_put_context(glamor_priv);
goto fail; goto fail;
} }
@ -302,8 +291,8 @@ glamor_tile(PixmapPtr pixmap, PixmapPtr tile,
else else
_glamor_tile(pixmap, tile, x, y, width, height, tile_x, tile_y); _glamor_tile(pixmap, tile, x, y, width, height, tile_x, tile_y);
glamor_set_alu(dispatch, GXcopy); glamor_set_alu(screen, GXcopy);
glamor_put_dispatch(glamor_priv); glamor_put_context(glamor_priv);
return TRUE; return TRUE;
fail: fail:
return FALSE; return FALSE;

213
glamor/glamor_trapezoid.c
View File

@ -204,24 +204,22 @@ static void
glamor_flush_composite_triangles(ScreenPtr screen) glamor_flush_composite_triangles(ScreenPtr screen)
{ {
glamor_screen_private *glamor_priv = glamor_get_screen_private(screen); glamor_screen_private *glamor_priv = glamor_get_screen_private(screen);
glamor_gl_dispatch *dispatch;
dispatch = glamor_get_dispatch(glamor_priv); glamor_get_context(glamor_priv);
if (glamor_priv->gl_flavor == GLAMOR_GL_DESKTOP) if (glamor_priv->gl_flavor == GLAMOR_GL_DESKTOP)
dispatch->glUnmapBuffer(GL_ARRAY_BUFFER); glUnmapBuffer(GL_ARRAY_BUFFER);
else { else {
dispatch->glBindBuffer(GL_ARRAY_BUFFER, glamor_priv->vbo); glBindBuffer(GL_ARRAY_BUFFER, glamor_priv->vbo);
dispatch->glBufferData(GL_ARRAY_BUFFER, glBufferData(GL_ARRAY_BUFFER, glamor_priv->vbo_offset,
glamor_priv->vbo_offset, glamor_priv->vb, GL_DYNAMIC_DRAW);
glamor_priv->vb, GL_DYNAMIC_DRAW);
} }
if (!glamor_priv->render_nr_verts) if (!glamor_priv->render_nr_verts)
return; return;
dispatch->glDrawArrays(GL_TRIANGLES, 0, glamor_priv->render_nr_verts); glDrawArrays(GL_TRIANGLES, 0, glamor_priv->render_nr_verts);
glamor_put_dispatch(glamor_priv); glamor_put_context(glamor_priv);
} }
static Bool static Bool
@ -582,7 +580,6 @@ static void
glamor_setup_composite_vbo_for_trapezoid(ScreenPtr screen, int n_verts) glamor_setup_composite_vbo_for_trapezoid(ScreenPtr screen, int n_verts)
{ {
glamor_screen_private *glamor_priv = glamor_get_screen_private(screen); glamor_screen_private *glamor_priv = glamor_get_screen_private(screen);
glamor_gl_dispatch *dispatch;
int stride; int stride;
int vert_size; int vert_size;
@ -605,25 +602,25 @@ glamor_setup_composite_vbo_for_trapezoid(ScreenPtr screen, int n_verts)
vert_size = n_verts * glamor_priv->vb_stride; vert_size = n_verts * glamor_priv->vb_stride;
dispatch = glamor_get_dispatch(glamor_priv); glamor_get_context(glamor_priv);
dispatch->glDisableVertexAttribArray(GLAMOR_VERTEX_POS); glDisableVertexAttribArray(GLAMOR_VERTEX_POS);
dispatch->glDisableVertexAttribArray(GLAMOR_VERTEX_SOURCE); glDisableVertexAttribArray(GLAMOR_VERTEX_SOURCE);
dispatch->glDisableVertexAttribArray(GLAMOR_VERTEX_TOP_BOTTOM); glDisableVertexAttribArray(GLAMOR_VERTEX_TOP_BOTTOM);
dispatch->glDisableVertexAttribArray(GLAMOR_VERTEX_LEFT_PARAM); glDisableVertexAttribArray(GLAMOR_VERTEX_LEFT_PARAM);
dispatch->glDisableVertexAttribArray(GLAMOR_VERTEX_RIGHT_PARAM); glDisableVertexAttribArray(GLAMOR_VERTEX_RIGHT_PARAM);
dispatch->glBindBuffer(GL_ARRAY_BUFFER, glamor_priv->vbo); glBindBuffer(GL_ARRAY_BUFFER, glamor_priv->vbo);
if (glamor_priv->gl_flavor == GLAMOR_GL_DESKTOP) { if (glamor_priv->gl_flavor == GLAMOR_GL_DESKTOP) {
if (glamor_priv->vbo_size < (glamor_priv->vbo_offset + vert_size)) { if (glamor_priv->vbo_size < (glamor_priv->vbo_offset + vert_size)) {
glamor_priv->vbo_size = GLAMOR_COMPOSITE_VBO_VERT_CNT * glamor_priv->vbo_size = GLAMOR_COMPOSITE_VBO_VERT_CNT *
glamor_priv->vb_stride; glamor_priv->vb_stride;
glamor_priv->vbo_offset = 0; glamor_priv->vbo_offset = 0;
dispatch->glBufferData(GL_ARRAY_BUFFER, glBufferData(GL_ARRAY_BUFFER,
glamor_priv->vbo_size, NULL, GL_STREAM_DRAW); glamor_priv->vbo_size, NULL, GL_STREAM_DRAW);
} }
glamor_priv->vb = dispatch->glMapBufferRange(GL_ARRAY_BUFFER, glamor_priv->vb = glMapBufferRange(GL_ARRAY_BUFFER,
glamor_priv->vbo_offset, glamor_priv->vbo_offset,
vert_size, vert_size,
GL_MAP_WRITE_BIT | GL_MAP_WRITE_BIT |
@ -636,43 +633,43 @@ glamor_setup_composite_vbo_for_trapezoid(ScreenPtr screen, int n_verts)
glamor_priv->vbo_offset = 0; glamor_priv->vbo_offset = 0;
} }
dispatch->glBindBuffer(GL_ELEMENT_ARRAY_BUFFER, glamor_priv->ebo); glBindBuffer(GL_ELEMENT_ARRAY_BUFFER, glamor_priv->ebo);
/* Set the vertex pointer. */ /* Set the vertex pointer. */
dispatch->glVertexAttribPointer(GLAMOR_VERTEX_POS, 2, GL_FLOAT, glVertexAttribPointer(GLAMOR_VERTEX_POS, 2, GL_FLOAT,
GL_FALSE, glamor_priv->vb_stride, GL_FALSE, glamor_priv->vb_stride,
(void *) ((long) glamor_priv->vbo_offset)); (void *) ((long) glamor_priv->vbo_offset));
dispatch->glEnableVertexAttribArray(GLAMOR_VERTEX_POS); glEnableVertexAttribArray(GLAMOR_VERTEX_POS);
stride = 2; stride = 2;
dispatch->glVertexAttribPointer(GLAMOR_VERTEX_SOURCE, 2, GL_FLOAT, glVertexAttribPointer(GLAMOR_VERTEX_SOURCE, 2, GL_FLOAT,
GL_FALSE, glamor_priv->vb_stride, GL_FALSE, glamor_priv->vb_stride,
(void *) ((long) glamor_priv->vbo_offset + (void *) ((long) glamor_priv->vbo_offset +
stride * sizeof(float))); stride * sizeof(float)));
dispatch->glEnableVertexAttribArray(GLAMOR_VERTEX_SOURCE); glEnableVertexAttribArray(GLAMOR_VERTEX_SOURCE);
stride += 2; stride += 2;
dispatch->glVertexAttribPointer(GLAMOR_VERTEX_TOP_BOTTOM, 2, GL_FLOAT, glVertexAttribPointer(GLAMOR_VERTEX_TOP_BOTTOM, 2, GL_FLOAT,
GL_FALSE, glamor_priv->vb_stride, GL_FALSE, glamor_priv->vb_stride,
(void *) ((long) glamor_priv->vbo_offset + (void *) ((long) glamor_priv->vbo_offset +
stride * sizeof(float))); stride * sizeof(float)));
dispatch->glEnableVertexAttribArray(GLAMOR_VERTEX_TOP_BOTTOM); glEnableVertexAttribArray(GLAMOR_VERTEX_TOP_BOTTOM);
stride += 2; stride += 2;
dispatch->glVertexAttribPointer(GLAMOR_VERTEX_LEFT_PARAM, 4, GL_FLOAT, glVertexAttribPointer(GLAMOR_VERTEX_LEFT_PARAM, 4, GL_FLOAT,
GL_FALSE, glamor_priv->vb_stride, GL_FALSE, glamor_priv->vb_stride,
(void *) ((long) glamor_priv->vbo_offset + (void *) ((long) glamor_priv->vbo_offset +
stride * sizeof(float))); stride * sizeof(float)));
dispatch->glEnableVertexAttribArray(GLAMOR_VERTEX_LEFT_PARAM); glEnableVertexAttribArray(GLAMOR_VERTEX_LEFT_PARAM);
stride += 4; stride += 4;
dispatch->glVertexAttribPointer(GLAMOR_VERTEX_RIGHT_PARAM, 4, GL_FLOAT, glVertexAttribPointer(GLAMOR_VERTEX_RIGHT_PARAM, 4, GL_FLOAT,
GL_FALSE, glamor_priv->vb_stride, GL_FALSE, glamor_priv->vb_stride,
(void *) ((long) glamor_priv->vbo_offset + (void *) ((long) glamor_priv->vbo_offset +
stride * sizeof(float))); stride * sizeof(float)));
dispatch->glEnableVertexAttribArray(GLAMOR_VERTEX_RIGHT_PARAM); glEnableVertexAttribArray(GLAMOR_VERTEX_RIGHT_PARAM);
glamor_put_dispatch(glamor_priv); glamor_put_context(glamor_priv);
} }
static Bool static Bool
@ -701,7 +698,6 @@ _glamor_trapezoids_with_shader(CARD8 op,
GLfloat dst_xscale, dst_yscale; GLfloat dst_xscale, dst_yscale;
BoxRec bounds; BoxRec bounds;
PicturePtr temp_src = src; PicturePtr temp_src = src;
glamor_gl_dispatch *dispatch = NULL;
int vert_stride = 3; int vert_stride = 3;
int ntriangle_per_loop; int ntriangle_per_loop;
int nclip_rect; int nclip_rect;
@ -815,6 +811,8 @@ _glamor_trapezoids_with_shader(CARD8 op,
goto TRAPEZOID_OUT; goto TRAPEZOID_OUT;
} }
glamor_get_context(glamor_priv);
box = REGION_RECTS(&region); box = REGION_RECTS(&region);
nbox = REGION_NUM_RECTS(&region); nbox = REGION_NUM_RECTS(&region);
pbox = box; pbox = box;
@ -833,8 +831,6 @@ _glamor_trapezoids_with_shader(CARD8 op,
glamor_priv->has_mask_coords = (key.mask != SHADER_MASK_NONE && glamor_priv->has_mask_coords = (key.mask != SHADER_MASK_NONE &&
key.mask != SHADER_MASK_SOLID); key.mask != SHADER_MASK_SOLID);
dispatch = glamor_get_dispatch(glamor_priv);
glamor_get_drawable_deltas(dst->pDrawable, dest_pixmap, glamor_get_drawable_deltas(dst->pDrawable, dest_pixmap,
&dest_x_off, &dest_y_off); &dest_x_off, &dest_y_off);
@ -974,19 +970,14 @@ _glamor_trapezoids_with_shader(CARD8 op,
ret = TRUE; ret = TRUE;
TRAPEZOID_RESET_GL: TRAPEZOID_RESET_GL:
dispatch->glBindBuffer(GL_ARRAY_BUFFER, 0); glBindBuffer(GL_ARRAY_BUFFER, 0);
dispatch->glBindBuffer(GL_ELEMENT_ARRAY_BUFFER, 0); glBindBuffer(GL_ELEMENT_ARRAY_BUFFER, 0);
dispatch->glDisableVertexAttribArray(GLAMOR_VERTEX_POS); glDisableVertexAttribArray(GLAMOR_VERTEX_POS);
dispatch->glDisableVertexAttribArray(GLAMOR_VERTEX_SOURCE); glDisableVertexAttribArray(GLAMOR_VERTEX_SOURCE);
dispatch->glDisableVertexAttribArray(GLAMOR_VERTEX_MASK); glDisableVertexAttribArray(GLAMOR_VERTEX_MASK);
dispatch->glDisable(GL_BLEND); glDisable(GL_BLEND);
#ifndef GLAMOR_GLES2 glUseProgram(0);
dispatch->glActiveTexture(GL_TEXTURE0); glamor_put_context(glamor_priv);
dispatch->glDisable(GL_TEXTURE_2D);
dispatch->glActiveTexture(GL_TEXTURE1);
dispatch->glDisable(GL_TEXTURE_2D);
#endif
dispatch->glUseProgram(0);
TRAPEZOID_OUT: TRAPEZOID_OUT:
if (box) { if (box) {
@ -1002,10 +993,6 @@ _glamor_trapezoids_with_shader(CARD8 op,
} }
} }
if (dispatch) {
glamor_put_dispatch(glamor_priv);
}
return ret; return ret;
} }
@ -1013,7 +1000,6 @@ void
glamor_init_trapezoid_shader(ScreenPtr screen) glamor_init_trapezoid_shader(ScreenPtr screen)
{ {
glamor_screen_private *glamor_priv; glamor_screen_private *glamor_priv;
glamor_gl_dispatch *dispatch;
GLint fs_prog, vs_prog; GLint fs_prog, vs_prog;
const char *trapezoid_vs = const char *trapezoid_vs =
@ -1344,46 +1330,43 @@ glamor_init_trapezoid_shader(ScreenPtr screen)
"}\n"; "}\n";
glamor_priv = glamor_get_screen_private(screen); glamor_priv = glamor_get_screen_private(screen);
dispatch = glamor_get_dispatch(glamor_priv); glamor_get_context(glamor_priv);
glamor_priv->trapezoid_prog = dispatch->glCreateProgram(); glamor_priv->trapezoid_prog = glCreateProgram();
vs_prog = glamor_compile_glsl_prog(dispatch, vs_prog = glamor_compile_glsl_prog(GL_VERTEX_SHADER, trapezoid_vs);
GL_VERTEX_SHADER, trapezoid_vs); fs_prog = glamor_compile_glsl_prog(GL_FRAGMENT_SHADER, trapezoid_fs);
fs_prog = glamor_compile_glsl_prog(dispatch,
GL_FRAGMENT_SHADER, trapezoid_fs);
dispatch->glAttachShader(glamor_priv->trapezoid_prog, vs_prog); glAttachShader(glamor_priv->trapezoid_prog, vs_prog);
dispatch->glAttachShader(glamor_priv->trapezoid_prog, fs_prog); glAttachShader(glamor_priv->trapezoid_prog, fs_prog);
dispatch->glBindAttribLocation(glamor_priv->trapezoid_prog, glBindAttribLocation(glamor_priv->trapezoid_prog,
GLAMOR_VERTEX_POS, "v_positionsition"); GLAMOR_VERTEX_POS, "v_positionsition");
dispatch->glBindAttribLocation(glamor_priv->trapezoid_prog, glBindAttribLocation(glamor_priv->trapezoid_prog,
GLAMOR_VERTEX_SOURCE, "v_texcoord"); GLAMOR_VERTEX_SOURCE, "v_texcoord");
dispatch->glBindAttribLocation(glamor_priv->trapezoid_prog, glBindAttribLocation(glamor_priv->trapezoid_prog,
GLAMOR_VERTEX_TOP_BOTTOM, "v_top_bottom"); GLAMOR_VERTEX_TOP_BOTTOM, "v_top_bottom");
dispatch->glBindAttribLocation(glamor_priv->trapezoid_prog, glBindAttribLocation(glamor_priv->trapezoid_prog,
GLAMOR_VERTEX_LEFT_PARAM, "v_left_param"); GLAMOR_VERTEX_LEFT_PARAM, "v_left_param");
dispatch->glBindAttribLocation(glamor_priv->trapezoid_prog, glBindAttribLocation(glamor_priv->trapezoid_prog,
GLAMOR_VERTEX_RIGHT_PARAM, "v_right_param"); GLAMOR_VERTEX_RIGHT_PARAM, "v_right_param");
glamor_link_glsl_prog(dispatch, glamor_priv->trapezoid_prog); glamor_link_glsl_prog(glamor_priv->trapezoid_prog);
dispatch->glUseProgram(0); glUseProgram(0);
glamor_put_dispatch(glamor_priv); glamor_put_context(glamor_priv);
} }
void void
glamor_fini_trapezoid_shader(ScreenPtr screen) glamor_fini_trapezoid_shader(ScreenPtr screen)
{ {
glamor_screen_private *glamor_priv; glamor_screen_private *glamor_priv;
glamor_gl_dispatch *dispatch;
glamor_priv = glamor_get_screen_private(screen); glamor_priv = glamor_get_screen_private(screen);
dispatch = glamor_get_dispatch(glamor_priv); glamor_get_context(glamor_priv);
dispatch->glDeleteProgram(glamor_priv->trapezoid_prog); glDeleteProgram(glamor_priv->trapezoid_prog);
glamor_put_dispatch(glamor_priv); glamor_put_context(glamor_priv);
} }
static Bool static Bool
@ -1392,7 +1375,6 @@ _glamor_generate_trapezoid_with_shader(ScreenPtr screen, PicturePtr picture,
BoxRec *bounds) BoxRec *bounds)
{ {
glamor_screen_private *glamor_priv; glamor_screen_private *glamor_priv;
glamor_gl_dispatch *dispatch;
glamor_pixmap_private *pixmap_priv; glamor_pixmap_private *pixmap_priv;
PixmapPtr pixmap = NULL; PixmapPtr pixmap = NULL;
GLint trapezoid_prog; GLint trapezoid_prog;
@ -1425,20 +1407,20 @@ _glamor_generate_trapezoid_with_shader(ScreenPtr screen, PicturePtr picture,
return FALSE; return FALSE;
} }
dispatch = glamor_get_dispatch(glamor_priv); glamor_get_context(glamor_priv);
glamor_set_destination_pixmap_priv_nc(pixmap_priv); glamor_set_destination_pixmap_priv_nc(pixmap_priv);
pixmap_priv_get_dest_scale(pixmap_priv, (&xscale), (&yscale)); pixmap_priv_get_dest_scale(pixmap_priv, (&xscale), (&yscale));
dispatch->glBindBuffer(GL_ARRAY_BUFFER, 0); glBindBuffer(GL_ARRAY_BUFFER, 0);
dispatch->glBindBuffer(GL_ELEMENT_ARRAY_BUFFER, 0); glBindBuffer(GL_ELEMENT_ARRAY_BUFFER, 0);
/* Now draw the Trapezoid mask. */ /* Now draw the Trapezoid mask. */
dispatch->glUseProgram(trapezoid_prog); glUseProgram(trapezoid_prog);
dispatch->glEnable(GL_BLEND); glEnable(GL_BLEND);
dispatch->glBlendFunc(GL_ONE, GL_ONE); glBlendFunc(GL_ONE, GL_ONE);
nrect_max = GLAMOR_COMPOSITE_VBO_VERT_CNT / (4 * GLAMOR_VERTEX_RIGHT_PARAM); nrect_max = GLAMOR_COMPOSITE_VBO_VERT_CNT / (4 * GLAMOR_VERTEX_RIGHT_PARAM);
@ -1565,37 +1547,36 @@ _glamor_generate_trapezoid_with_shader(ScreenPtr screen, PicturePtr picture,
continue; continue;
if (glamor_priv->gl_flavor == GLAMOR_GL_DESKTOP) if (glamor_priv->gl_flavor == GLAMOR_GL_DESKTOP)
dispatch->glUnmapBuffer(GL_ARRAY_BUFFER); glUnmapBuffer(GL_ARRAY_BUFFER);
else { else {
dispatch->glBindBuffer(GL_ARRAY_BUFFER, glamor_priv->vbo); glBindBuffer(GL_ARRAY_BUFFER, glamor_priv->vbo);
dispatch->glBufferData(GL_ARRAY_BUFFER, glBufferData(GL_ARRAY_BUFFER, glamor_priv->vbo_offset,
glamor_priv->vbo_offset, glamor_priv->vb, GL_DYNAMIC_DRAW);
glamor_priv->vb, GL_DYNAMIC_DRAW);
} }
#ifndef GLAMOR_GLES2 if (glamor_priv->gl_flavor == GLAMOR_GL_DESKTOP) {
dispatch->glDrawRangeElements(GL_TRIANGLES, 0, glDrawRangeElements(GL_TRIANGLES, 0,
glamor_priv->render_nr_verts, glamor_priv->render_nr_verts,
(glamor_priv->render_nr_verts * 3) / 2, (glamor_priv->render_nr_verts * 3) / 2,
GL_UNSIGNED_SHORT, NULL); GL_UNSIGNED_SHORT, NULL);
#else } else {
dispatch->glDrawElements(GL_TRIANGLES, glDrawElements(GL_TRIANGLES,
(glamor_priv->render_nr_verts * 3) / 2, (glamor_priv->render_nr_verts * 3) / 2,
GL_UNSIGNED_SHORT, NULL); GL_UNSIGNED_SHORT, NULL);
#endif }
} }
dispatch->glBindBuffer(GL_ARRAY_BUFFER, 0); glBindBuffer(GL_ARRAY_BUFFER, 0);
dispatch->glBindBuffer(GL_ELEMENT_ARRAY_BUFFER, 0); glBindBuffer(GL_ELEMENT_ARRAY_BUFFER, 0);
dispatch->glBlendFunc(GL_ONE, GL_ZERO); glBlendFunc(GL_ONE, GL_ZERO);
dispatch->glDisable(GL_BLEND); glDisable(GL_BLEND);
dispatch->glDisableVertexAttribArray(GLAMOR_VERTEX_POS); glDisableVertexAttribArray(GLAMOR_VERTEX_POS);
dispatch->glDisableVertexAttribArray(GLAMOR_VERTEX_SOURCE); glDisableVertexAttribArray(GLAMOR_VERTEX_SOURCE);
dispatch->glDisableVertexAttribArray(GLAMOR_VERTEX_TOP_BOTTOM); glDisableVertexAttribArray(GLAMOR_VERTEX_TOP_BOTTOM);
dispatch->glDisableVertexAttribArray(GLAMOR_VERTEX_LEFT_PARAM); glDisableVertexAttribArray(GLAMOR_VERTEX_LEFT_PARAM);
dispatch->glDisableVertexAttribArray(GLAMOR_VERTEX_RIGHT_PARAM); glDisableVertexAttribArray(GLAMOR_VERTEX_RIGHT_PARAM);
dispatch->glUseProgram(0); glUseProgram(0);
glamor_put_dispatch(glamor_priv); glamor_put_context(glamor_priv);
return TRUE; return TRUE;
} }

373
glamor/glamor_utils.h
View File

@ -869,19 +869,17 @@ format_for_depth(int depth)
} }
} }
static inline void static inline GLenum
gl_iformat_for_depth(int depth, GLenum * format) gl_iformat_for_pixmap(PixmapPtr pixmap)
{ {
switch (depth) { glamor_screen_private *glamor_priv =
#ifndef GLAMOR_GLES2 glamor_get_screen_private(pixmap->drawable.pScreen);
case 1:
case 8: if (glamor_priv->gl_flavor == GLAMOR_GL_DESKTOP &&
*format = GL_ALPHA; (pixmap->drawable.depth == 1 || pixmap->drawable.depth == 8)) {
break; return GL_ALPHA;
#endif } else {
default: return GL_RGBA;
*format = GL_RGBA;
break;
} }
} }
@ -916,298 +914,6 @@ format_for_pixmap(PixmapPtr pixmap)
#define SWAP_UPLOADING 2 #define SWAP_UPLOADING 2
#define SWAP_NONE_UPLOADING 3 #define SWAP_NONE_UPLOADING 3
/*
* Map picture's format to the correct gl texture format and type.
* no_alpha is used to indicate whehter we need to wire alpha to 1.
*
* Although opengl support A1/GL_BITMAP, we still don't use it
* here, it seems that mesa has bugs when uploading a A1 bitmap.
*
* Return 0 if find a matched texture type. Otherwise return -1.
**/
#ifndef GLAMOR_GLES2
static inline int
glamor_get_tex_format_type_from_pictformat(PictFormatShort format,
GLenum * tex_format,
GLenum * tex_type,
int *no_alpha,
int *revert,
int *swap_rb, int is_upload)
{
*no_alpha = 0;
*revert = REVERT_NONE;
*swap_rb = is_upload ? SWAP_NONE_UPLOADING : SWAP_NONE_DOWNLOADING;
switch (format) {
case PICT_a1:
*tex_format = GL_ALPHA;
*tex_type = GL_UNSIGNED_BYTE;
*revert = is_upload ? REVERT_UPLOADING_A1 : REVERT_DOWNLOADING_A1;
break;
case PICT_b8g8r8x8:
*no_alpha = 1;
case PICT_b8g8r8a8:
*tex_format = GL_BGRA;
*tex_type = GL_UNSIGNED_INT_8_8_8_8;
break;
case PICT_x8r8g8b8:
*no_alpha = 1;
case PICT_a8r8g8b8:
*tex_format = GL_BGRA;
*tex_type = GL_UNSIGNED_INT_8_8_8_8_REV;
break;
case PICT_x8b8g8r8:
*no_alpha = 1;
case PICT_a8b8g8r8:
*tex_format = GL_RGBA;
*tex_type = GL_UNSIGNED_INT_8_8_8_8_REV;
break;
case PICT_x2r10g10b10:
*no_alpha = 1;
case PICT_a2r10g10b10:
*tex_format = GL_BGRA;
*tex_type = GL_UNSIGNED_INT_2_10_10_10_REV;
break;
case PICT_x2b10g10r10:
*no_alpha = 1;
case PICT_a2b10g10r10:
*tex_format = GL_RGBA;
*tex_type = GL_UNSIGNED_INT_2_10_10_10_REV;
break;
case PICT_r5g6b5:
*tex_format = GL_RGB;
*tex_type = GL_UNSIGNED_SHORT_5_6_5;
break;
case PICT_b5g6r5:
*tex_format = GL_RGB;
*tex_type = GL_UNSIGNED_SHORT_5_6_5_REV;
break;
case PICT_x1b5g5r5:
*no_alpha = 1;
case PICT_a1b5g5r5:
*tex_format = GL_RGBA;
*tex_type = GL_UNSIGNED_SHORT_1_5_5_5_REV;
break;
case PICT_x1r5g5b5:
*no_alpha = 1;
case PICT_a1r5g5b5:
*tex_format = GL_BGRA;
*tex_type = GL_UNSIGNED_SHORT_1_5_5_5_REV;
break;
case PICT_a8:
*tex_format = GL_ALPHA;
*tex_type = GL_UNSIGNED_BYTE;
break;
case PICT_x4r4g4b4:
*no_alpha = 1;
case PICT_a4r4g4b4:
*tex_format = GL_BGRA;
*tex_type = GL_UNSIGNED_SHORT_4_4_4_4_REV;
break;
case PICT_x4b4g4r4:
*no_alpha = 1;
case PICT_a4b4g4r4:
*tex_format = GL_RGBA;
*tex_type = GL_UNSIGNED_SHORT_4_4_4_4_REV;
break;
default:
LogMessageVerb(X_INFO, 0,
"fail to get matched format for %x \n", format);
return -1;
}
return 0;
}
/* Currently, we use RGBA to represent all formats. */
inline static int
cache_format(GLenum format)
{
switch (format) {
case GL_ALPHA:
return 1;
case GL_RGBA:
return 0;
default:
return -1;
}
}
#else
#define IS_LITTLE_ENDIAN (IMAGE_BYTE_ORDER == LSBFirst)
static inline int
glamor_get_tex_format_type_from_pictformat(PictFormatShort format,
GLenum * tex_format,
GLenum * tex_type,
int *no_alpha,
int *revert,
int *swap_rb, int is_upload)
{
int need_swap_rb = 0;
*no_alpha = 0;
*revert = IS_LITTLE_ENDIAN ? REVERT_NONE : REVERT_NORMAL;
switch (format) {
case PICT_b8g8r8x8:
*no_alpha = 1;
case PICT_b8g8r8a8:
*tex_format = GL_RGBA;
*tex_type = GL_UNSIGNED_BYTE;
need_swap_rb = 1;
*revert = IS_LITTLE_ENDIAN ? REVERT_NORMAL : REVERT_NONE;
break;
case PICT_x8r8g8b8:
*no_alpha = 1;
case PICT_a8r8g8b8:
*tex_format = GL_RGBA;
*tex_type = GL_UNSIGNED_BYTE;
need_swap_rb = 1;
break;
case PICT_x8b8g8r8:
*no_alpha = 1;
case PICT_a8b8g8r8:
*tex_format = GL_RGBA;
*tex_type = GL_UNSIGNED_BYTE;
break;
case PICT_x2r10g10b10:
*no_alpha = 1;
case PICT_a2r10g10b10:
*tex_format = GL_RGBA;
/* glReadPixmap doesn't support GL_UNSIGNED_INT_10_10_10_2.
* we have to use GL_UNSIGNED_BYTE and do the conversion in
* shader latter.*/
*tex_type = GL_UNSIGNED_BYTE;
if (is_upload == 1) {
if (!IS_LITTLE_ENDIAN)
*revert = REVERT_UPLOADING_10_10_10_2;
else
*revert = REVERT_UPLOADING_2_10_10_10;
}
else {
if (!IS_LITTLE_ENDIAN) {
*revert = REVERT_DOWNLOADING_10_10_10_2;
}
else {
*revert = REVERT_DOWNLOADING_2_10_10_10;
}
}
need_swap_rb = 1;
break;
case PICT_x2b10g10r10:
*no_alpha = 1;
case PICT_a2b10g10r10:
*tex_format = GL_RGBA;
*tex_type = GL_UNSIGNED_BYTE;
if (is_upload == 1) {
if (!IS_LITTLE_ENDIAN)
*revert = REVERT_UPLOADING_10_10_10_2;
else
*revert = REVERT_UPLOADING_2_10_10_10;
}
else {
if (!IS_LITTLE_ENDIAN) {
*revert = REVERT_DOWNLOADING_10_10_10_2;
}
else {
*revert = REVERT_DOWNLOADING_2_10_10_10;
}
}
break;
case PICT_r5g6b5:
*tex_format = GL_RGB;
*tex_type = GL_UNSIGNED_SHORT_5_6_5;
*revert = IS_LITTLE_ENDIAN ? REVERT_NONE : REVERT_NORMAL;
break;
case PICT_b5g6r5:
*tex_format = GL_RGB;
*tex_type = GL_UNSIGNED_SHORT_5_6_5;
need_swap_rb = IS_LITTLE_ENDIAN ? 1 : 0;;
break;
case PICT_x1b5g5r5:
*no_alpha = 1;
case PICT_a1b5g5r5:
*tex_format = GL_RGBA;
*tex_type = GL_UNSIGNED_SHORT_5_5_5_1;
if (IS_LITTLE_ENDIAN) {
*revert =
is_upload ? REVERT_UPLOADING_1_5_5_5 :
REVERT_DOWNLOADING_1_5_5_5;
}
else
*revert = REVERT_NONE;
break;
case PICT_x1r5g5b5:
*no_alpha = 1;
case PICT_a1r5g5b5:
*tex_format = GL_RGBA;
*tex_type = GL_UNSIGNED_SHORT_5_5_5_1;
if (IS_LITTLE_ENDIAN) {
*revert =
is_upload ? REVERT_UPLOADING_1_5_5_5 :
REVERT_DOWNLOADING_1_5_5_5;
}
else
*revert = REVERT_NONE;
need_swap_rb = 1;
break;
case PICT_a1:
*tex_format = GL_ALPHA;
*tex_type = GL_UNSIGNED_BYTE;
*revert = is_upload ? REVERT_UPLOADING_A1 : REVERT_DOWNLOADING_A1;
break;
case PICT_a8:
*tex_format = GL_ALPHA;
*tex_type = GL_UNSIGNED_BYTE;
*revert = REVERT_NONE;
break;
case PICT_x4r4g4b4:
*no_alpha = 1;
case PICT_a4r4g4b4:
*tex_format = GL_RGBA;
*tex_type = GL_UNSIGNED_SHORT_4_4_4_4;
*revert = IS_LITTLE_ENDIAN ? REVERT_NORMAL : REVERT_NONE;
need_swap_rb = 1;
break;
case PICT_x4b4g4r4:
*no_alpha = 1;
case PICT_a4b4g4r4:
*tex_format = GL_RGBA;
*tex_type = GL_UNSIGNED_SHORT_4_4_4_4;
*revert = IS_LITTLE_ENDIAN ? REVERT_NORMAL : REVERT_NONE;
break;
default:
LogMessageVerb(X_INFO, 0,
"fail to get matched format for %x \n", format);
return -1;
}
if (need_swap_rb)
*swap_rb = is_upload ? SWAP_UPLOADING : SWAP_DOWNLOADING;
else
*swap_rb = is_upload ? SWAP_NONE_UPLOADING : SWAP_NONE_DOWNLOADING;
return 0;
}
inline static int inline static int
cache_format(GLenum format) cache_format(GLenum format)
{ {
@ -1223,31 +929,6 @@ cache_format(GLenum format)
} }
} }
#endif
static inline int
glamor_get_tex_format_type_from_pixmap(PixmapPtr pixmap,
GLenum * format,
GLenum * type,
int *no_alpha,
int *revert, int *swap_rb, int is_upload)
{
glamor_pixmap_private *pixmap_priv;
PictFormatShort pict_format;
pixmap_priv = glamor_get_pixmap_private(pixmap);
if (GLAMOR_PIXMAP_PRIV_IS_PICTURE(pixmap_priv))
pict_format = pixmap_priv->base.picture->format;
else
pict_format = format_for_depth(pixmap->drawable.depth);
return glamor_get_tex_format_type_from_pictformat(pict_format,
format, type,
no_alpha,
revert,
swap_rb, is_upload);
}
/* borrowed from uxa */ /* borrowed from uxa */
static inline Bool static inline Bool
glamor_get_rgba_from_pixel(CARD32 pixel, glamor_get_rgba_from_pixel(CARD32 pixel,
@ -1319,16 +1000,18 @@ glamor_get_rgba_from_pixel(CARD32 pixel,
} }
inline static Bool inline static Bool
glamor_pict_format_is_compatible(PictFormatShort pict_format, int depth) glamor_pict_format_is_compatible(PicturePtr picture)
{ {
GLenum iformat; GLenum iformat;
PixmapPtr pixmap = glamor_get_drawable_pixmap(picture->pDrawable);
gl_iformat_for_depth(depth, &iformat); iformat = gl_iformat_for_pixmap(pixmap);
switch (iformat) { switch (iformat) {
case GL_RGBA: case GL_RGBA:
return (pict_format == PICT_a8r8g8b8 || pict_format == PICT_x8r8g8b8); return (picture->format == PICT_a8r8g8b8 ||
picture->format == PICT_x8r8g8b8);
case GL_ALPHA: case GL_ALPHA:
return (pict_format == PICT_a8); return (picture->format == PICT_a8);
default: default:
return FALSE; return FALSE;
} }
@ -1817,31 +1500,15 @@ __fls(unsigned long x)
#endif #endif
static inline void static inline void
glamor_make_current(ScreenPtr screen) glamor_get_context(glamor_screen_private * glamor_priv)
{ {
glamor_egl_make_current(screen); glamor_priv->ctx.get_context(&glamor_priv->ctx);
} }
static inline void static inline void
glamor_restore_current(ScreenPtr screen) glamor_put_context(glamor_screen_private * glamor_priv)
{ {
glamor_egl_restore_context(screen); glamor_priv->ctx.put_context(&glamor_priv->ctx);
}
static inline glamor_gl_dispatch *
glamor_get_dispatch(glamor_screen_private * glamor_priv)
{
if (glamor_priv->flags & GLAMOR_USE_EGL_SCREEN)
glamor_make_current(glamor_priv->screen);
return &glamor_priv->_dispatch;
}
static inline void
glamor_put_dispatch(glamor_screen_private * glamor_priv)
{
if (glamor_priv->flags & GLAMOR_USE_EGL_SCREEN)
glamor_restore_current(glamor_priv->screen);
} }
#endif #endif

130
glamor/glamor_xv.c
View File

@ -90,38 +90,36 @@ void
glamor_init_xv_shader(ScreenPtr screen) glamor_init_xv_shader(ScreenPtr screen)
{ {
glamor_screen_private *glamor_priv; glamor_screen_private *glamor_priv;
glamor_gl_dispatch *dispatch;
GLint fs_prog, vs_prog; GLint fs_prog, vs_prog;
glamor_priv = glamor_get_screen_private(screen); glamor_priv = glamor_get_screen_private(screen);
dispatch = glamor_get_dispatch(glamor_priv); glamor_get_context(glamor_priv);
glamor_priv->xv_prog = dispatch->glCreateProgram(); glamor_priv->xv_prog = glCreateProgram();
vs_prog = glamor_compile_glsl_prog(dispatch, GL_VERTEX_SHADER, xv_vs); vs_prog = glamor_compile_glsl_prog(GL_VERTEX_SHADER, xv_vs);
fs_prog = glamor_compile_glsl_prog(dispatch, GL_FRAGMENT_SHADER, xv_ps); fs_prog = glamor_compile_glsl_prog(GL_FRAGMENT_SHADER, xv_ps);
dispatch->glAttachShader(glamor_priv->xv_prog, vs_prog); glAttachShader(glamor_priv->xv_prog, vs_prog);
dispatch->glAttachShader(glamor_priv->xv_prog, fs_prog); glAttachShader(glamor_priv->xv_prog, fs_prog);
dispatch->glBindAttribLocation(glamor_priv->xv_prog, glBindAttribLocation(glamor_priv->xv_prog,
GLAMOR_VERTEX_POS, "v_position"); GLAMOR_VERTEX_POS, "v_position");
dispatch->glBindAttribLocation(glamor_priv->xv_prog, glBindAttribLocation(glamor_priv->xv_prog,
GLAMOR_VERTEX_SOURCE, "v_texcoord0"); GLAMOR_VERTEX_SOURCE, "v_texcoord0");
glamor_link_glsl_prog(dispatch, glamor_priv->xv_prog); glamor_link_glsl_prog(glamor_priv->xv_prog);
glamor_put_dispatch(glamor_priv); glamor_put_context(glamor_priv);
} }
void void
glamor_fini_xv_shader(ScreenPtr screen) glamor_fini_xv_shader(ScreenPtr screen)
{ {
glamor_screen_private *glamor_priv; glamor_screen_private *glamor_priv;
glamor_gl_dispatch *dispatch;
glamor_priv = glamor_get_screen_private(screen); glamor_priv = glamor_get_screen_private(screen);
dispatch = glamor_get_dispatch(glamor_priv); glamor_get_context(glamor_priv);
dispatch->glDeleteProgram(glamor_priv->xv_prog); glDeleteProgram(glamor_priv->xv_prog);
glamor_put_dispatch(glamor_priv); glamor_put_context(glamor_priv);
} }
#define ClipValue(v,min,max) ((v) < (min) ? (min) : (v) > (max) ? (max) : (v)) #define ClipValue(v,min,max) ((v) < (min) ? (min) : (v) > (max) ? (max) : (v))
@ -278,7 +276,6 @@ glamor_display_textured_video(glamor_port_private *port_priv)
glamor_pixmap_private *pixmap_priv = glamor_pixmap_private *pixmap_priv =
glamor_get_pixmap_private(port_priv->pPixmap); glamor_get_pixmap_private(port_priv->pPixmap);
glamor_pixmap_private *src_pixmap_priv[3]; glamor_pixmap_private *src_pixmap_priv[3];
glamor_gl_dispatch *dispatch;
float vertices[32], texcoords[8]; float vertices[32], texcoords[8];
BoxPtr box = REGION_RECTS(&port_priv->clip); BoxPtr box = REGION_RECTS(&port_priv->clip);
int nBox = REGION_NUM_RECTS(&port_priv->clip); int nBox = REGION_NUM_RECTS(&port_priv->clip);
@ -327,62 +324,53 @@ glamor_display_textured_video(glamor_port_private *port_priv)
&src_yscale[i]); &src_yscale[i]);
} }
} }
dispatch = glamor_get_dispatch(glamor_priv); glamor_get_context(glamor_priv);
dispatch->glUseProgram(glamor_priv->xv_prog); glUseProgram(glamor_priv->xv_prog);
uloc = dispatch->glGetUniformLocation(glamor_priv->xv_prog, "offsetyco"); uloc = glGetUniformLocation(glamor_priv->xv_prog, "offsetyco");
dispatch->glUniform4f(uloc, off[0], off[1], off[2], yco); glUniform4f(uloc, off[0], off[1], off[2], yco);
uloc = dispatch->glGetUniformLocation(glamor_priv->xv_prog, "ucogamma"); uloc = glGetUniformLocation(glamor_priv->xv_prog, "ucogamma");
dispatch->glUniform4f(uloc, uco[0], uco[1], uco[2], gamma); glUniform4f(uloc, uco[0], uco[1], uco[2], gamma);
uloc = dispatch->glGetUniformLocation(glamor_priv->xv_prog, "vco"); uloc = glGetUniformLocation(glamor_priv->xv_prog, "vco");
dispatch->glUniform4f(uloc, vco[0], vco[1], vco[2], 0); glUniform4f(uloc, vco[0], vco[1], vco[2], 0);
dispatch->glActiveTexture(GL_TEXTURE0); glActiveTexture(GL_TEXTURE0);
dispatch->glBindTexture(GL_TEXTURE_2D, src_pixmap_priv[0]->base.fbo->tex); glBindTexture(GL_TEXTURE_2D, src_pixmap_priv[0]->base.fbo->tex);
dispatch->glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR); glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
dispatch->glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR); glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
dispatch->glTexParameteri(GL_TEXTURE_2D, glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE);
GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE); glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
dispatch->glTexParameteri(GL_TEXTURE_2D,
GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
dispatch->glActiveTexture(GL_TEXTURE1); glActiveTexture(GL_TEXTURE1);
dispatch->glBindTexture(GL_TEXTURE_2D, src_pixmap_priv[1]->base.fbo->tex); glBindTexture(GL_TEXTURE_2D, src_pixmap_priv[1]->base.fbo->tex);
dispatch->glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR); glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
dispatch->glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR); glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
dispatch->glTexParameteri(GL_TEXTURE_2D, glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE);
GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE); glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
dispatch->glTexParameteri(GL_TEXTURE_2D,
GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
dispatch->glActiveTexture(GL_TEXTURE2); glActiveTexture(GL_TEXTURE2);
dispatch->glBindTexture(GL_TEXTURE_2D, src_pixmap_priv[2]->base.fbo->tex); glBindTexture(GL_TEXTURE_2D, src_pixmap_priv[2]->base.fbo->tex);
dispatch->glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR); glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
dispatch->glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR); glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
dispatch->glTexParameteri(GL_TEXTURE_2D, glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE);
GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE); glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
dispatch->glTexParameteri(GL_TEXTURE_2D,
GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
sampler_loc = sampler_loc = glGetUniformLocation(glamor_priv->xv_prog, "y_sampler");
dispatch->glGetUniformLocation(glamor_priv->xv_prog, "y_sampler"); glUniform1i(sampler_loc, 0);
dispatch->glUniform1i(sampler_loc, 0); sampler_loc = glGetUniformLocation(glamor_priv->xv_prog, "u_sampler");
sampler_loc = glUniform1i(sampler_loc, 1);
dispatch->glGetUniformLocation(glamor_priv->xv_prog, "u_sampler"); sampler_loc = glGetUniformLocation(glamor_priv->xv_prog, "v_sampler");
dispatch->glUniform1i(sampler_loc, 1); glUniform1i(sampler_loc, 2);
sampler_loc =
dispatch->glGetUniformLocation(glamor_priv->xv_prog, "v_sampler");
dispatch->glUniform1i(sampler_loc, 2);
dispatch->glVertexAttribPointer(GLAMOR_VERTEX_SOURCE, 2, glVertexAttribPointer(GLAMOR_VERTEX_SOURCE, 2,
GL_FLOAT, GL_FALSE, GL_FLOAT, GL_FALSE,
2 * sizeof(float), texcoords); 2 * sizeof(float), texcoords);
dispatch->glEnableVertexAttribArray(GLAMOR_VERTEX_SOURCE); glEnableVertexAttribArray(GLAMOR_VERTEX_SOURCE);
dispatch->glVertexAttribPointer(GLAMOR_VERTEX_POS, 2, GL_FLOAT, glVertexAttribPointer(GLAMOR_VERTEX_POS, 2, GL_FLOAT,
GL_FALSE, 2 * sizeof(float), vertices); GL_FALSE, 2 * sizeof(float), vertices);
dispatch->glEnableVertexAttribArray(GLAMOR_VERTEX_POS); glEnableVertexAttribArray(GLAMOR_VERTEX_POS);
for (i = 0; i < nBox; i++) { for (i = 0; i < nBox; i++) {
float off_x = box[i].x1 - port_priv->drw_x; float off_x = box[i].x1 - port_priv->drw_x;
float off_y = box[i].y1 - port_priv->drw_y; float off_y = box[i].y1 - port_priv->drw_y;
@ -418,14 +406,14 @@ glamor_display_textured_video(glamor_port_private *port_priv)
srcy + srch, srcy + srch,
glamor_priv->yInverted, texcoords); glamor_priv->yInverted, texcoords);
dispatch->glDrawArrays(GL_TRIANGLE_FAN, 0, 4); glDrawArrays(GL_TRIANGLE_FAN, 0, 4);
} }
dispatch->glDisableVertexAttribArray(GLAMOR_VERTEX_POS); glDisableVertexAttribArray(GLAMOR_VERTEX_POS);
dispatch->glDisableVertexAttribArray(GLAMOR_VERTEX_SOURCE); glDisableVertexAttribArray(GLAMOR_VERTEX_SOURCE);
dispatch->glUseProgram(0); glUseProgram(0);
glamor_put_dispatch(glamor_priv); glamor_put_context(glamor_priv);
DamageDamageRegion(port_priv->pDraw, &port_priv->clip); DamageDamageRegion(port_priv->pDraw, &port_priv->clip);
} }