Commit: d737b41a4717aefbf648248447b1308b0db2205a
Author: TheOnlyJoey
Date: Thu Mar 10 20:02:02 2016 +0100
Branches: HMD_viewport
https://developer.blender.org/rBd737b41a4717aefbf648248447b1308b0db2205a
Added lens distortion glsl shader for use with HMD (Head Mounted Display)
functionality
NOTE: Still has some debug information and test buttons
===================================================================
M release/scripts/startup/bl_ui/space_view3d.py
M source/blender/blenkernel/intern/screen.c
M source/blender/blenloader/intern/readfile.c
M source/blender/blenloader/intern/writefile.c
M source/blender/editors/interface/interface_handlers.c
M source/blender/editors/render/render_opengl.c
M source/blender/editors/space_view3d/space_view3d.c
M source/blender/editors/space_view3d/view3d_draw.c
M source/blender/gpu/CMakeLists.txt
M source/blender/gpu/GPU_compositing.h
M source/blender/gpu/intern/gpu_compositing.c
M source/blender/gpu/intern/gpu_shader.c
A source/blender/gpu/shaders/gpu_shader_fx_lensdistortion_frag.glsl
A source/blender/gpu/shaders/gpu_shader_fx_lensdistortion_vert.glsl
M source/blender/makesdna/DNA_gpu_types.h
M source/blender/makesrna/intern/rna_scene.c
===================================================================
diff --git a/release/scripts/startup/bl_ui/space_view3d.py
b/release/scripts/startup/bl_ui/space_view3d.py
index cbcdb86..7723502 100644
--- a/release/scripts/startup/bl_ui/space_view3d.py
+++ b/release/scripts/startup/bl_ui/space_view3d.py
@@ -3260,6 +3260,7 @@ class VIEW3D_PT_view3d_shading(Panel):
sub.active = view.region_3d.view_perspective == 'CAMERA'
sub.prop(fx_settings, "use_dof")
col.prop(fx_settings, "use_ssao", text="Ambient Occlusion")
+ col.prop(fx_settings, "use_lens_dist", text="MYBUTTOX")
if fx_settings.use_ssao:
ssao_settings = fx_settings.ssao
subcol = col.column(align=True)
diff --git a/source/blender/blenkernel/intern/screen.c
b/source/blender/blenkernel/intern/screen.c
index 139c667..f006dd1 100644
--- a/source/blender/blenkernel/intern/screen.c
+++ b/source/blender/blenkernel/intern/screen.c
@@ -64,7 +64,7 @@ static void spacetype_free(SpaceType *st)
ARegionType *art;
PanelType *pt;
HeaderType *ht;
-
+
for (art = st->regiontypes.first; art; art = art->next) {
BLI_freelistN(&art->drawcalls);
@@ -79,7 +79,7 @@ static void spacetype_free(SpaceType *st)
BLI_freelistN(&art->paneltypes);
BLI_freelistN(&art->headertypes);
}
-
+
BLI_freelistN(&st->regiontypes);
BLI_freelistN(&st->toolshelf);
@@ -88,18 +88,18 @@ static void spacetype_free(SpaceType *st)
void BKE_spacetypes_free(void)
{
SpaceType *st;
-
+
for (st = spacetypes.first; st; st = st->next) {
spacetype_free(st);
}
-
+
BLI_freelistN(&spacetypes);
}
SpaceType *BKE_spacetype_from_id(int spaceid)
{
SpaceType *st;
-
+
for (st = spacetypes.first; st; st = st->next) {
if (st->spaceid == spaceid)
return st;
@@ -110,11 +110,11 @@ SpaceType *BKE_spacetype_from_id(int spaceid)
ARegionType *BKE_regiontype_from_id(SpaceType *st, int regionid)
{
ARegionType *art;
-
+
for (art = st->regiontypes.first; art; art = art->next)
if (art->regionid == regionid)
return art;
-
+
printf("Error, region type %d missing in - name:\"%s\", id:%d\n",
regionid, st->name, st->spaceid);
return st->regiontypes.first;
}
@@ -128,7 +128,7 @@ const ListBase *BKE_spacetypes_list(void)
void BKE_spacetype_register(SpaceType *st)
{
SpaceType *stype;
-
+
/* sanity check */
stype = BKE_spacetype_from_id(st->spaceid);
if (stype) {
@@ -136,7 +136,7 @@ void BKE_spacetype_register(SpaceType *st)
spacetype_free(stype);
MEM_freeN(stype);
}
-
+
BLI_addtail(&spacetypes, st);
}
@@ -151,20 +151,20 @@ void BKE_spacedata_freelist(ListBase *lb)
{
SpaceLink *sl;
ARegion *ar;
-
+
for (sl = lb->first; sl; sl = sl->next) {
SpaceType *st = BKE_spacetype_from_id(sl->spacetype);
-
+
/* free regions for pushed spaces */
for (ar = sl->regionbase.first; ar; ar = ar->next)
BKE_area_region_free(st, ar);
BLI_freelistN(&sl->regionbase);
-
- if (st && st->free)
+
+ if (st && st->free)
st->free(sl);
}
-
+
BLI_freelistN(lb);
}
@@ -172,7 +172,7 @@ ARegion *BKE_area_region_copy(SpaceType *st, ARegion *ar)
{
ARegion *newar = MEM_dupallocN(ar);
Panel *pa, *newpa, *patab;
-
+
newar->prev = newar->next = NULL;
BLI_listbase_clear(&newar->handlers);
BLI_listbase_clear(&newar->uiblocks);
@@ -181,7 +181,7 @@ ARegion *BKE_area_region_copy(SpaceType *st, ARegion *ar)
BLI_listbase_clear(&newar->ui_lists);
newar->swinid = 0;
newar->regiontimer = NULL;
-
+
/* use optional regiondata callback */
if (ar->regiondata) {
ARegionType *art = BKE_regiontype_from_id(st, ar->regiontype);
@@ -194,7 +194,7 @@ ARegion *BKE_area_region_copy(SpaceType *st, ARegion *ar)
if (ar->v2d.tab_offset)
newar->v2d.tab_offset = MEM_dupallocN(ar->v2d.tab_offset);
-
+
BLI_listbase_clear(&newar->panels);
BLI_duplicatelist(&newar->panels, &ar->panels);
@@ -214,7 +214,7 @@ ARegion *BKE_area_region_copy(SpaceType *st, ARegion *ar)
pa = pa->next;
}
}
-
+
return newar;
}
@@ -223,10 +223,10 @@ ARegion *BKE_area_region_copy(SpaceType *st, ARegion *ar)
static void region_copylist(SpaceType *st, ListBase *lb1, ListBase *lb2)
{
ARegion *ar;
-
+
/* to be sure */
BLI_listbase_clear(lb1);
-
+
for (ar = lb2->first; ar; ar = ar->next) {
ARegion *arnew = BKE_area_region_copy(st, ar);
BLI_addtail(lb1, arnew);
@@ -238,17 +238,17 @@ static void region_copylist(SpaceType *st, ListBase *lb1,
ListBase *lb2)
void BKE_spacedata_copylist(ListBase *lb1, ListBase *lb2)
{
SpaceLink *sl;
-
+
BLI_listbase_clear(lb1); /* to be sure */
-
+
for (sl = lb2->first; sl; sl = sl->next) {
SpaceType *st = BKE_spacetype_from_id(sl->spacetype);
-
+
if (st && st->duplicate) {
SpaceLink *slnew = st->duplicate(sl);
-
+
BLI_addtail(lb1, slnew);
-
+
region_copylist(st, &slnew->regionbase,
&sl->regionbase);
}
}
@@ -260,14 +260,14 @@ void BKE_spacedata_copylist(ListBase *lb1, ListBase *lb2)
void BKE_spacedata_draw_locks(int set)
{
SpaceType *st;
-
+
for (st = spacetypes.first; st; st = st->next) {
ARegionType *art;
-
+
for (art = st->regiontypes.first; art; art = art->next) {
- if (set)
+ if (set)
art->do_lock = art->lock;
- else
+ else
art->do_lock = false;
}
}
@@ -294,16 +294,16 @@ void BKE_area_region_free(SpaceType *st, ARegion *ar)
if (st) {
ARegionType *art = BKE_regiontype_from_id(st, ar->regiontype);
-
+
if (art && art->free)
art->free(ar);
-
+
if (ar->regiondata)
printf("regiondata free error\n");
}
else if (ar->type && ar->type->free)
ar->type->free(ar);
-
+
if (ar->v2d.tab_offset) {
MEM_freeN(ar->v2d.tab_offset);
ar->v2d.tab_offset = NULL;
@@ -347,14 +347,14 @@ void BKE_screen_area_free(ScrArea *sa)
{
SpaceType *st = BKE_spacetype_from_id(sa->spacetype);
ARegion *ar;
-
+
for (ar = sa->regionbase.first; ar; ar = ar->next)
BKE_area_region_free(st, ar);
BLI_freelistN(&sa->regionbase);
-
+
BKE_spacedata_freelist(&sa->spacedata);
-
+
BLI_freelistN(&sa->actionzones);
}
@@ -363,17 +363,17 @@ void BKE_screen_free(bScreen *sc)
{
ScrArea *sa, *san;
ARegion *ar;
-
+
for (ar = sc->regionbase.first; ar; ar = ar->next)
BKE_area_region_free(NULL, ar);
BLI_freelistN(&sc->regionbase);
-
+
for (sa = sc->areabase.first; sa; sa = san) {
san = sa->next;
BKE_screen_area_free(sa);
}
-
+
BLI_freelistN(&sc->vertbase);
BLI_freelistN(&sc->edgebase);
BLI_freelistN(&sc->areabase);
@@ -405,7 +405,7 @@ ARegion *BKE_area_find_region_type(ScrArea *sa, int type)
{
if (sa) {
ARegion *ar;
-
+
for (ar = sa->regionbase.first; ar; ar = ar->next) {
if (ar->regiontype == type)
return ar;
@@ -679,4 +679,13 @@ void BKE_screen_gpu_fx_validate(GPUFXSettings *fx_settings)
GPU_fx_compositor_init_ssao_settings(fx_ssao);
}
+
+ if ((fx_settings->lens_dist == NULL) &&
+ (fx_settings->fx_flag & GPU_FX_FLAG_LensDist))
+ {
+ GPULensDistortionSettings *fx_lens_dist;
+ fx_lens_dist = fx_settings->lens_dist =
MEM_callocN(sizeof(GPULensDistortionSettings), __func__);
+
+ //GPU_fx_compositor_init_ssao_settings(fx_ssao);
+ }
}
diff --git a/source/blender/blenloader/intern/readfile.c
b/source/blender/blenloader/intern/readfile.c
index 3758374..84260b1 100644
--- a/source/blender/blenloader/intern/readfile.c
+++ b/source/blender/blenloader/intern/readfile.c
@@ -243,17 +243,17 @@ static BHead *find_bhead_from_idname(FileData *fd, const
char *idname);
void blo_reportf_wrap(ReportList *reports, ReportType type, const char
*format, ...)
{
char fixed_buf[1024]; /* should be long enough */
-
+
va_list args;
-
+
va_start(args, format);
vsnprintf(fixed_buf, sizeof(fixed_buf), format, args);
va_end(args);
-
+
fixed_buf[sizeof(fixed_buf) - 1] = '\0';
-
+
BKE_report(reports, type, fixed_buf);
-
+
if (G.background == 0) {
printf("%s: %s\n", BKE_report_type_str(type), fixed_buf);
}
@@ -265,39 +265,39 @@ static const char *library_parent_filepath(Library *lib)
return lib->parent ? lib->parent->filepath : "<direct>";
}
-static OldNewMap *oldnewmap_new(void)
+static OldNewMap *oldnewmap_new(void)
{
OldNewMap *onm= MEM_callocN(sizeof(*onm), "OldNewMap");
-
+
onm->entriessize = 1024;
onm->entries = MEM_mallocN(sizeof(*onm->entries)*onm->entriessize,
"OldNewMap.entries");
-
+
return onm;
}
static int verg_oldnewmap(const void *v1, const void *v2)
{
const struct OldNew *x1=v1, *x2=v2;
-
+
if (x1->old > x2->old) return 1;
else if (x1->old < x2->old) return -1;
return 0;
}
-static void oldnewmap_sort(FileData *fd)
+static void oldnewmap_sort(FileData *fd)
{
qsort(fd->libmap->entries, fd->libmap->nentries, sizeof(OldNew),
verg_oldnewmap);
fd->libmap->sorted = 1;
}
/* nr is zero for data, and ID code for libdata */
-static void oldnewmap_insert(OldNewMap *onm, void *oldaddr, void *newaddr, int
nr)
+static void oldnewmap_insert(OldNewMap *onm, void *oldaddr, void *newaddr, int
nr)
{
OldNew *entry;
-
+
if (oldaddr==NULL || newaddr==NULL) return;
-
+
if (UNLIKELY(onm->nentries == onm->entriessize)) {
onm->entriessize *= 2;
onm->entries = MEM_reallocN(onm->entries, sizeof(*onm->entries)
* onm->entriessize);
@@ -364,22 +364,22 @@ static int oldnewmap_lookup_entry_full(const OldNewMap
*onm, const void *addr, i
return -1;
}
-static void *oldnewmap_lookup_and_inc(OldNewMap *onm, void *addr, bool
increase_users)
+static void *oldnewmap_lookup_and_inc(OldNewMap *onm, void *addr, bool
increase_users)
{
int i;
-
+
if (addr == NULL) return NULL;
-
+
if (onm->lasthit < onm->nentries-1) {
OldNew *entry = &onm->entries[++onm->lasthit];
-
+
if (entry->old == addr) {
if (increase_users)
entry->nr++;
return entry->newp;
}
}
-
+
i = oldnewmap_lookup_entry_full(onm, addr, onm->lasthit);
if (i != -1) {
OldNew *entry = &onm->entries[i];
@@ -389,7 +389,7 @@ static void *oldnewmap_lookup_and_inc(OldNewMap *onm, void
*addr, bool increase_
entry->nr++;
return entry->newp;
}
-
+
return NULL;
}
@@ -431,7 +431,7 @@ static void *oldnewmap_liblookup(OldNewMap *onm, void
*addr, void *lib)
return NULL;
}
-static void oldnewmap_free_unused(OldNewMap *onm)
+stati
@@ Diff output truncated at 10240 characters. @@
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
