Revision: 37916
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=37916
Author: blendix
Date: 2011-06-28 16:25:07 +0000 (Tue, 28 Jun 2011)
Log Message:
-----------
RenderEngine API: add self.report() error reporting function for render engines,
works the same as for operators. Also includes some refactoring of render error
reporting code to use ReportList.
Modified Paths:
--------------
trunk/blender/source/blender/editors/render/render_internal.c
trunk/blender/source/blender/makesrna/intern/rna_render.c
trunk/blender/source/blender/render/extern/include/RE_pipeline.h
trunk/blender/source/blender/render/intern/include/render_types.h
trunk/blender/source/blender/render/intern/source/pipeline.c
trunk/blender/source/blenderplayer/bad_level_call_stubs/stubs.c
trunk/blender/source/creator/creator.c
Modified: trunk/blender/source/blender/editors/render/render_internal.c
===================================================================
--- trunk/blender/source/blender/editors/render/render_internal.c
2011-06-28 16:24:18 UTC (rev 37915)
+++ trunk/blender/source/blender/editors/render/render_internal.c
2011-06-28 16:25:07 UTC (rev 37916)
@@ -189,11 +189,6 @@
/* set callbacks, exported to sequence render too.
Only call in foreground (UI) renders. */
-static void render_error_reports(void *reports, const char *str)
-{
- BKE_report(reports, RPT_ERROR, str);
-}
-
/* executes blocking render */
static int screen_render_exec(bContext *C, wmOperator *op)
{
@@ -214,7 +209,6 @@
G.afbreek= 0;
RE_test_break_cb(re, NULL, (int (*)(void *)) blender_test_break);
- RE_error_cb(re, op->reports, render_error_reports);
ima= BKE_image_verify_viewer(IMA_TYPE_R_RESULT, "Render Result");
BKE_image_signal(ima, NULL, IMA_SIGNAL_FREE);
@@ -226,11 +220,15 @@
since sequence rendering can call that recursively... (peter) */
seq_stripelem_cache_cleanup();
+ RE_SetReports(re, op->reports);
+
if(is_animation)
- RE_BlenderAnim(re, mainp, scene, camera_override, lay,
scene->r.sfra, scene->r.efra, scene->r.frame_step, op->reports);
+ RE_BlenderAnim(re, mainp, scene, camera_override, lay,
scene->r.sfra, scene->r.efra, scene->r.frame_step);
else
RE_BlenderFrame(re, mainp, scene, NULL, camera_override, lay,
scene->r.cfra, is_write_still);
+ RE_SetReports(re, NULL);
+
// no redraw needed, we leave state as we entered it
ED_update_for_newframe(mainp, scene, CTX_wm_screen(C), 1);
@@ -374,10 +372,14 @@
rj->do_update= do_update;
rj->progress= progress;
+ RE_SetReports(rj->re, rj->reports);
+
if(rj->anim)
- RE_BlenderAnim(rj->re, rj->main, rj->scene,
rj->camera_override, rj->lay, rj->scene->r.sfra, rj->scene->r.efra,
rj->scene->r.frame_step, rj->reports);
+ RE_BlenderAnim(rj->re, rj->main, rj->scene,
rj->camera_override, rj->lay, rj->scene->r.sfra, rj->scene->r.efra,
rj->scene->r.frame_step);
else
RE_BlenderFrame(rj->re, rj->main, rj->scene, rj->srl,
rj->camera_override, rj->lay, rj->scene->r.cfra, rj->write_still);
+
+ RE_SetReports(rj->re, NULL);
}
static void render_endjob(void *rjv)
@@ -470,7 +472,7 @@
if(WM_jobs_test(CTX_wm_manager(C), scene))
return OPERATOR_CANCELLED;
- if(!RE_is_rendering_allowed(scene, camera_override, op->reports,
render_error_reports)) {
+ if(!RE_is_rendering_allowed(scene, camera_override, op->reports)) {
return OPERATOR_CANCELLED;
}
@@ -578,8 +580,6 @@
rj->re= re;
G.afbreek= 0;
- RE_error_cb(re, op->reports, render_error_reports);
-
WM_jobs_start(CTX_wm_manager(C), steve);
WM_cursor_wait(0);
@@ -596,7 +596,6 @@
return OPERATOR_RUNNING_MODAL;
}
-
/* contextual render, using current scene, view3d? */
void RENDER_OT_render(wmOperatorType *ot)
{
Modified: trunk/blender/source/blender/makesrna/intern/rna_render.c
===================================================================
--- trunk/blender/source/blender/makesrna/intern/rna_render.c 2011-06-28
16:24:18 UTC (rev 37915)
+++ trunk/blender/source/blender/makesrna/intern/rna_render.c 2011-06-28
16:25:07 UTC (rev 37916)
@@ -32,6 +32,7 @@
#include "DNA_scene_types.h"
#include "RNA_define.h"
+#include "RNA_enum_types.h"
#include "rna_internal.h"
@@ -271,6 +272,12 @@
prop= RNA_def_string(func, "info", "", 0, "Info", "");
RNA_def_property_flag(prop, PROP_REQUIRED);
+ func= RNA_def_function(srna, "report", "RE_engine_report");
+ prop= RNA_def_enum_flag(func, "type", wm_report_items, 0, "Type", "");
+ RNA_def_property_flag(prop, PROP_REQUIRED);
+ prop= RNA_def_string(func, "message", "", 0, "Report Message", "");
+ RNA_def_property_flag(prop, PROP_REQUIRED);
+
/* registration */
RNA_define_verify_sdna(0);
Modified: trunk/blender/source/blender/render/extern/include/RE_pipeline.h
===================================================================
--- trunk/blender/source/blender/render/extern/include/RE_pipeline.h
2011-06-28 16:24:18 UTC (rev 37915)
+++ trunk/blender/source/blender/render/extern/include/RE_pipeline.h
2011-06-28 16:25:07 UTC (rev 37916)
@@ -218,8 +218,11 @@
/* only RE_NewRender() needed, main Blender render calls */
void RE_BlenderFrame(struct Render *re, struct Main *bmain, struct Scene
*scene, struct SceneRenderLayer *srl, struct Object *camera_override, unsigned
int lay, int frame, const short write_still);
-void RE_BlenderAnim(struct Render *re, struct Main *bmain, struct Scene
*scene, struct Object *camera_override, unsigned int lay, int sfra, int efra,
int tfra, struct ReportList *reports);
+void RE_BlenderAnim(struct Render *re, struct Main *bmain, struct Scene
*scene, struct Object *camera_override, unsigned int lay, int sfra, int efra,
int tfra);
+/* error reporting */
+void RE_SetReports(struct Render *re, struct ReportList *reports);
+
/* main preview render call */
void RE_PreviewRender(struct Render *re, struct Main *bmain, struct Scene
*scene);
@@ -242,7 +245,6 @@
void RE_progress_cb (struct Render *re, void *handle, void (*f)(void
*handle, float));
void RE_draw_lock_cb (struct Render *re, void *handle, void
(*f)(void *handle, int));
void RE_test_break_cb (struct Render *re, void *handle, int (*f)(void
*handle));
-void RE_error_cb (struct Render *re, void *handle, void
(*f)(void *handle, const char *str));
/* should move to kernel once... still unsure on how/where */
float RE_filter_value(int type, float x);
@@ -308,11 +310,12 @@
int RE_engine_test_break(RenderEngine *engine);
void RE_engine_update_stats(RenderEngine *engine, const char *stats, const
char *info);
+void RE_engine_report(RenderEngine *engine, int type, const char *msg);
void RE_engines_init(void);
void RE_engines_exit(void);
-int RE_is_rendering_allowed(struct Scene *scene, struct Object
*camera_override, void *erh, void (*error)(void *handle, const char *str));
+int RE_is_rendering_allowed(struct Scene *scene, struct Object
*camera_override, struct ReportList *reports);
#endif /* RE_PIPELINE_H */
Modified: trunk/blender/source/blender/render/intern/include/render_types.h
===================================================================
--- trunk/blender/source/blender/render/intern/include/render_types.h
2011-06-28 16:24:18 UTC (rev 37915)
+++ trunk/blender/source/blender/render/intern/include/render_types.h
2011-06-28 16:25:07 UTC (rev 37916)
@@ -60,6 +60,7 @@
struct ObjectInstanceRen;
struct RayObject;
struct RayFace;
+struct ReportList;
struct Main;
#define TABLEINITSIZE 1024
@@ -252,10 +253,9 @@
int (*test_break)(void *handle);
void *tbh;
- void (*error)(void *handle, const char *str);
- void *erh;
-
RenderStats i;
+
+ struct ReportList *reports;
};
/* ------------------------------------------------------------------------- */
Modified: trunk/blender/source/blender/render/intern/source/pipeline.c
===================================================================
--- trunk/blender/source/blender/render/intern/source/pipeline.c
2011-06-28 16:24:18 UTC (rev 37915)
+++ trunk/blender/source/blender/render/intern/source/pipeline.c
2011-06-28 16:25:07 UTC (rev 37916)
@@ -128,7 +128,7 @@
/* ********* alloc and free ******** */
-static int do_write_image_or_movie(Render *re, Scene *scene, bMovieHandle *mh,
ReportList *reports, const char *name_override);
+static int do_write_image_or_movie(Render *re, Scene *scene, bMovieHandle *mh,
const char *name_override);
static volatile int g_break= 0;
static int thread_break(void *UNUSED(arg))
@@ -141,7 +141,6 @@
static void result_rcti_nothing(void *UNUSED(arg), RenderResult *UNUSED(rr),
volatile struct rcti *UNUSED(rect)) {}
static void stats_nothing(void *UNUSED(arg), RenderStats *UNUSED(rs)) {}
static void float_nothing(void *UNUSED(arg), float UNUSED(val)) {}
-static void print_error(void *UNUSED(arg), const char *str) {printf("ERROR:
%s\n", str);}
static int default_break(void *UNUSED(arg)) {return G.afbreek == 1;}
static void stats_background(void *UNUSED(arg), RenderStats *rs)
@@ -1190,13 +1189,12 @@
re->display_draw= result_rcti_nothing;
re->progress= float_nothing;
re->test_break= default_break;
- re->error= print_error;
if(G.background)
re->stats_draw= stats_background;
else
re->stats_draw= stats_nothing;
/* clear callback handles */
- re->dih= re->dch= re->ddh= re->sdh= re->prh= re->tbh= re->erh= NULL;
+ re->dih= re->dch= re->ddh= re->sdh= re->prh= re->tbh= NULL;
}
/* only call this while you know it will remove the link too */
@@ -1251,7 +1249,7 @@
if(re->rectx < 2 || re->recty < 2 || (BKE_imtype_is_movie(rd->imtype) &&
(re->rectx < 16 || re->recty < 16) )) {
- re->error(re->erh, "Image too small");
+ BKE_report(re->reports, RPT_ERROR, "Image too small");
re->ok= 0;
return;
}
@@ -1417,11 +1415,6 @@
re->test_break= f;
re->tbh= handle;
}
-void RE_error_cb(Render *re, void *handle, void (*f)(void *handle, const char
*str))
-{
- re->error= f;
- re->erh= handle;
-}
/* ********* add object data (later) ******** */
@@ -2710,14 +2703,14 @@
return 1;
}
-int RE_is_rendering_allowed(Scene *scene, Object *camera_override, void *erh,
void (*error)(void *handle, const char *str))
+int RE_is_rendering_allowed(Scene *scene, Object *camera_override, ReportList
*reports)
{
SceneRenderLayer *srl;
if(scene->r.mode & R_BORDER) {
if(scene->r.border.xmax <= scene->r.border.xmin ||
scene->r.border.ymax <= scene->r.border.ymin) {
- error(erh, "No border area selected.");
+ BKE_report(reports, RPT_ERROR, "No border area
selected.");
return 0;
}
}
@@ -2728,13 +2721,13 @@
scene_unique_exr_name(scene, str, 0);
if (BLI_is_writable(str)==0) {
- error(erh, "Can not save render buffers, check the temp
default path");
+ BKE_report(reports, RPT_ERROR, "Can not save render
buffers, check the temp default path");
return 0;
}
/* no fullsample and edge */
if((scene->r.scemode & R_FULL_SAMPLE) && (scene->r.mode &
R_EDGE)) {
- error(erh, "Full Sample doesn't support Edge Enhance");
+ BKE_report(reports, RPT_ERROR, "Full Sample doesn't
support Edge Enhance");
return 0;
}
@@ -2748,7 +2741,7 @@
bNode *node;
if(ntree==NULL) {
- error(erh, "No Nodetree in Scene");
+ BKE_report(reports, RPT_ERROR, "No Nodetree in
Scene");
return 0;
}
@@ -2757,13 +2750,13 @@
break;
if(node==NULL) {
@@ Diff output truncated at 10240 characters. @@
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
