fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-03-06 05:40:30 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

mesa: move texrender.c to swrast

Browse source 
This stuff is really for software rendering, it's not core Mesa.
A small step toward pushing the FetchTexel() stuff down into swrast.

Reviewed-by: Eric Anholt <eric@anholt.net>
This commit is contained in:
Brian Paul 2011-06-13 13:44:35 -06:00
parent 8852e35e29
commit 755f2e2ae5
8 changed files with 35 additions and 44 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/mesa/SConscript
View file

@ -121,7 +121,6 @@ main_sources = [
'main/texobj.c',
'main/texpal.c',
'main/texparam.c',
'main/texrender.c',
'main/texstate.c',
'main/texstore.c',
'main/texturebarrier.c',
@ -174,6 +173,7 @@ swrast_sources = [
'swrast/s_stencil.c',
'swrast/s_texcombine.c',
'swrast/s_texfilter.c',
'swrast/s_texrender.c',
'swrast/s_triangle.c',
'swrast/s_zoom.c',
]

5
src/mesa/drivers/common/driverfuncs.c
View file

@ -40,7 +40,6 @@
#include "main/texstore.h"
#include "main/bufferobj.h"
#include "main/fbobject.h"
#include "main/texrender.h"
#include "main/samplerobj.h"
#include "main/syncobj.h"
#include "main/texturebarrier.h"
@ -183,8 +182,8 @@ _mesa_init_driver_functions(struct dd_function_table *driver)
driver->NewFramebuffer = _mesa_new_framebuffer;
driver->NewRenderbuffer = _mesa_new_soft_renderbuffer;
driver->RenderTexture = _mesa_render_texture;
driver->FinishRenderTexture = _mesa_finish_render_texture;
driver->RenderTexture = _swrast_render_texture;
driver->FinishRenderTexture = _swrast_finish_render_texture;
driver->FramebufferRenderbuffer = _mesa_framebuffer_renderbuffer;
driver->ValidateFramebuffer = _mesa_validate_framebuffer;

8
src/mesa/drivers/dri/intel/intel_fbo.c
View file

@ -35,7 +35,7 @@
#include "main/renderbuffer.h"
#include "main/context.h"
#include "main/teximage.h"
#include "main/texrender.h"
#include "swrast/s_texrender.h"
#include "drivers/common/meta.h"
#include "intel_context.h"
@ -557,7 +557,7 @@ intel_render_texture(struct gl_context * ctx,
* (has a border, width/height 0, etc.)
*/
_mesa_reference_renderbuffer(&att->Renderbuffer, NULL);
_mesa_render_texture(ctx, fb, att);
_swrast_render_texture(ctx, fb, att);
return;
}
else if (!irb) {
@ -568,14 +568,14 @@ intel_render_texture(struct gl_context * ctx,
}
else {
/* fallback to software rendering */
_mesa_render_texture(ctx, fb, att);
_swrast_render_texture(ctx, fb, att);
return;
}
}
if (!intel_update_wrapper(ctx, irb, newImage)) {
_mesa_reference_renderbuffer(&att->Renderbuffer, NULL);
_mesa_render_texture(ctx, fb, att);
_swrast_render_texture(ctx, fb, att);
return;
}

8
src/mesa/drivers/dri/radeon/radeon_fbo.c
View file

@ -35,7 +35,7 @@
#include "main/framebuffer.h"
#include "main/renderbuffer.h"
#include "main/context.h"
#include "main/texrender.h"
#include "swrast/s_texrender.h"
#include "drivers/common/meta.h"
#include "radeon_common.h"
@ -557,7 +557,7 @@ radeon_render_texture(struct gl_context * ctx,
/* Fallback on drawing to a texture without a miptree.
*/
_mesa_reference_renderbuffer(&att->Renderbuffer, NULL);
_mesa_render_texture(ctx, fb, att);
_swrast_render_texture(ctx, fb, att);
return;
}
else if (!rrb) {
@ -568,14 +568,14 @@ radeon_render_texture(struct gl_context * ctx,
}
else {
/* fallback to software rendering */
_mesa_render_texture(ctx, fb, att);
_swrast_render_texture(ctx, fb, att);
return;
}
}
if (!radeon_update_wrapper(ctx, rrb, newImage)) {
_mesa_reference_renderbuffer(&att->Renderbuffer, NULL);
_mesa_render_texture(ctx, fb, att);
_swrast_render_texture(ctx, fb, att);
return;
}

18
src/mesa/main/texrender.h
View file

@ -1,18 +0,0 @@
#ifndef TEXRENDER_H
#define TEXRENDER_H
struct gl_context;
struct gl_framebuffer;
struct gl_renderbuffer_attachment;
extern void
_mesa_render_texture(struct gl_context *ctx,
struct gl_framebuffer *fb,
struct gl_renderbuffer_attachment *att);
extern void
_mesa_finish_render_texture(struct gl_context *ctx,
struct gl_renderbuffer_attachment *att);
#endif /* TEXRENDER_H */

2
src/mesa/sources.mak
View file

@ -92,7 +92,6 @@ MAIN_SOURCES = \
main/texobj.c \
main/texpal.c \
main/texparam.c \
main/texrender.c \
main/texstate.c \
main/texstore.c \
main/texturebarrier.c \
@ -145,6 +144,7 @@ SWRAST_SOURCES = \
swrast/s_stencil.c \
swrast/s_texcombine.c \
swrast/s_texfilter.c \
swrast/s_texrender.c \
swrast/s_triangle.c \
swrast/s_zoom.c

26
src/mesa/main/texrender.c → src/mesa/swrast/s_texrender.c
View file

@ -1,12 +1,12 @@
#include "context.h"
#include "colormac.h"
#include "fbobject.h"
#include "macros.h"
#include "texfetch.h"
#include "teximage.h"
#include "texrender.h"
#include "renderbuffer.h"
#include "main/context.h"
#include "main/colormac.h"
#include "main/fbobject.h"
#include "main/macros.h"
#include "main/texfetch.h"
#include "main/teximage.h"
#include "main/renderbuffer.h"
#include "swrast/swrast.h"
/*
@ -628,9 +628,9 @@ update_wrapper(struct gl_context *ctx, struct gl_renderbuffer_attachment *att)
* \sa _mesa_framebuffer_renderbuffer
*/
void
_mesa_render_texture(struct gl_context *ctx,
struct gl_framebuffer *fb,
struct gl_renderbuffer_attachment *att)
_swrast_render_texture(struct gl_context *ctx,
struct gl_framebuffer *fb,
struct gl_renderbuffer_attachment *att)
{
(void) fb;
@ -642,8 +642,8 @@ _mesa_render_texture(struct gl_context *ctx,
void
_mesa_finish_render_texture(struct gl_context *ctx,
struct gl_renderbuffer_attachment *att)
_swrast_finish_render_texture(struct gl_context *ctx,
struct gl_renderbuffer_attachment *att)
{
/* do nothing */
/* The renderbuffer texture wrapper will get deleted by the

10
src/mesa/swrast/swrast.h
View file

@ -206,6 +206,16 @@ extern void
_swrast_eject_texture_images(struct gl_context *ctx);
extern void
_swrast_render_texture(struct gl_context *ctx,
struct gl_framebuffer *fb,
struct gl_renderbuffer_attachment *att);
extern void
_swrast_finish_render_texture(struct gl_context *ctx,
struct gl_renderbuffer_attachment *att);
/**
* The driver interface for the software rasterizer.