projects
/
mesa.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Drop GLcontext typedef and use struct gl_context instead
[mesa.git]
/
src
/
mesa
/
state_tracker
/
st_cb_eglimage.c
diff --git
a/src/mesa/state_tracker/st_cb_eglimage.c
b/src/mesa/state_tracker/st_cb_eglimage.c
index 0fa1848e23233026b5696a9c3a4b282b0ac9b145..298f8a5b12bc2ba6f93b62dec0edcdac802fe907 100644
(file)
--- a/
src/mesa/state_tracker/st_cb_eglimage.c
+++ b/
src/mesa/state_tracker/st_cb_eglimage.c
@@
-33,6
+33,7
@@
#include "util/u_format.h"
#include "st_cb_eglimage.h"
#include "st_cb_fbo.h"
#include "util/u_format.h"
#include "st_cb_eglimage.h"
#include "st_cb_fbo.h"
+#include "st_context.h"
#include "st_texture.h"
#include "st_format.h"
#include "st_manager.h"
#include "st_texture.h"
#include "st_format.h"
#include "st_manager.h"
@@
-70,7
+71,7
@@
st_pipe_format_to_base_format(enum pipe_format format)
}
static void
}
static void
-st_egl_image_target_renderbuffer_storage(
GL
context *ctx,
+st_egl_image_target_renderbuffer_storage(
struct gl_
context *ctx,
struct gl_renderbuffer *rb,
GLeglImageOES image_handle)
{
struct gl_renderbuffer *rb,
GLeglImageOES image_handle)
{
@@
-79,7
+80,7
@@
st_egl_image_target_renderbuffer_storage(GLcontext *ctx,
struct pipe_surface *ps;
unsigned usage;
struct pipe_surface *ps;
unsigned usage;
- usage = PIPE_BIND_RENDER_TARGET
| PIPE_BIND_BLIT_SOURCE | PIPE_BIND_BLIT_DESTINATION
;
+ usage = PIPE_BIND_RENDER_TARGET;
ps = st_manager_get_egl_image_surface(st, (void *) image_handle, usage);
if (ps) {
strb->Base.Width = ps->width;
ps = st_manager_get_egl_image_surface(st, (void *) image_handle, usage);
if (ps) {
strb->Base.Width = ps->width;
@@
-97,7
+98,7
@@
st_egl_image_target_renderbuffer_storage(GLcontext *ctx,
}
static void
}
static void
-st_bind_surface(
GL
context *ctx, GLenum target,
+st_bind_surface(
struct gl_
context *ctx, GLenum target,
struct gl_texture_object *texObj,
struct gl_texture_image *texImage,
struct pipe_surface *ps)
struct gl_texture_object *texObj,
struct gl_texture_image *texImage,
struct pipe_surface *ps)
@@
-127,13
+128,18
@@
st_bind_surface(GLcontext *ctx, GLenum target,
_mesa_set_fetch_functions(texImage, 2);
/* FIXME create a non-default sampler view from the pipe_surface? */
_mesa_set_fetch_functions(texImage, 2);
/* FIXME create a non-default sampler view from the pipe_surface? */
- pipe_resource_reference(&stImage->pt, ps->texture);
+ pipe_resource_reference(&stObj->pt, ps->texture);
+ pipe_resource_reference(&stImage->pt, stObj->pt);
+
+ stObj->width0 = ps->width;
+ stObj->height0 = ps->height;
+ stObj->depth0 = 1;
_mesa_dirty_texobj(ctx, texObj, GL_TRUE);
}
static void
_mesa_dirty_texobj(ctx, texObj, GL_TRUE);
}
static void
-st_egl_image_target_texture_2d(
GL
context *ctx, GLenum target,
+st_egl_image_target_texture_2d(
struct gl_
context *ctx, GLenum target,
struct gl_texture_object *texObj,
struct gl_texture_image *texImage,
GLeglImageOES image_handle)
struct gl_texture_object *texObj,
struct gl_texture_image *texImage,
GLeglImageOES image_handle)
@@
-142,7
+148,7
@@
st_egl_image_target_texture_2d(GLcontext *ctx, GLenum target,
struct pipe_surface *ps;
unsigned usage;
struct pipe_surface *ps;
unsigned usage;
- usage = PIPE_BIND_SAMPLER_VIEW
| PIPE_BIND_BLIT_DESTINATION | PIPE_BIND_BLIT_SOURCE
;
+ usage = PIPE_BIND_SAMPLER_VIEW;
ps = st_manager_get_egl_image_surface(st, (void *) image_handle, usage);
if (ps) {
st_bind_surface(ctx, target, texObj, texImage, ps);
ps = st_manager_get_egl_image_surface(st, (void *) image_handle, usage);
if (ps) {
st_bind_surface(ctx, target, texObj, texImage, ps);