Revision: 58912
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=58912
Author: jwilkins
Date: 2013-08-04 22:37:22 +0000 (Sun, 04 Aug 2013)
Log Message:
-----------
compiles again
Modified Paths:
--------------
branches/soc-2013-viewport_fx/source/blender/blenfont/BLF_api.h
branches/soc-2013-viewport_fx/source/blender/blenfont/intern/blf.c
branches/soc-2013-viewport_fx/source/blender/blenkernel/BKE_animsys.h
branches/soc-2013-viewport_fx/source/blender/blenkernel/BKE_brush.h
branches/soc-2013-viewport_fx/source/blender/blenkernel/BKE_global.h
branches/soc-2013-viewport_fx/source/blender/blenkernel/BKE_property.h
branches/soc-2013-viewport_fx/source/blender/blenkernel/intern/cdderivedmesh.c
branches/soc-2013-viewport_fx/source/blender/blenkernel/intern/editderivedmesh.c
branches/soc-2013-viewport_fx/source/blender/blenkernel/intern/subsurf_ccg.c
branches/soc-2013-viewport_fx/source/blender/blenlib/intern/math_geom.c
branches/soc-2013-viewport_fx/source/blender/blenlib/intern/string.c
branches/soc-2013-viewport_fx/source/blender/blenloader/intern/readfile.c
branches/soc-2013-viewport_fx/source/blender/editors/include/ED_anim_api.h
branches/soc-2013-viewport_fx/source/blender/editors/include/ED_gpencil.h
branches/soc-2013-viewport_fx/source/blender/editors/include/ED_keyframing.h
branches/soc-2013-viewport_fx/source/blender/editors/include/ED_uvedit.h
branches/soc-2013-viewport_fx/source/blender/editors/include/ED_view3d.h
branches/soc-2013-viewport_fx/source/blender/editors/include/UI_interface.h
branches/soc-2013-viewport_fx/source/blender/editors/interface/interface.c
branches/soc-2013-viewport_fx/source/blender/editors/interface/interface_draw.c
branches/soc-2013-viewport_fx/source/blender/editors/interface/interface_icons.c
branches/soc-2013-viewport_fx/source/blender/editors/interface/interface_intern.h
branches/soc-2013-viewport_fx/source/blender/editors/interface/interface_regions.c
branches/soc-2013-viewport_fx/source/blender/editors/interface/interface_widgets.c
branches/soc-2013-viewport_fx/source/blender/editors/interface/resources.c
branches/soc-2013-viewport_fx/source/blender/editors/screen/glutil.c
branches/soc-2013-viewport_fx/source/blender/editors/sculpt_paint/paint_cursor.c
branches/soc-2013-viewport_fx/source/blender/editors/sculpt_paint/paint_image.c
branches/soc-2013-viewport_fx/source/blender/editors/sculpt_paint/paint_image_proj.c
branches/soc-2013-viewport_fx/source/blender/editors/sculpt_paint/paint_intern.h
branches/soc-2013-viewport_fx/source/blender/editors/sculpt_paint/sculpt_intern.h
branches/soc-2013-viewport_fx/source/blender/editors/space_file/file_draw.c
branches/soc-2013-viewport_fx/source/blender/editors/space_file/file_intern.h
branches/soc-2013-viewport_fx/source/blender/editors/space_file/filesel.c
branches/soc-2013-viewport_fx/source/blender/editors/space_sequencer/sequencer_draw.c
branches/soc-2013-viewport_fx/source/blender/editors/space_view3d/drawanimviz.c
branches/soc-2013-viewport_fx/source/blender/editors/space_view3d/drawarmature.c
branches/soc-2013-viewport_fx/source/blender/editors/space_view3d/drawmesh.c
branches/soc-2013-viewport_fx/source/blender/editors/space_view3d/drawobject.c
branches/soc-2013-viewport_fx/source/blender/editors/space_view3d/view3d_draw.c
branches/soc-2013-viewport_fx/source/blender/editors/space_view3d/view3d_intern.h
branches/soc-2013-viewport_fx/source/blender/editors/uvedit/uvedit_draw.c
branches/soc-2013-viewport_fx/source/blender/editors/uvedit/uvedit_ops.c
branches/soc-2013-viewport_fx/source/blender/gpu/intern/gpu_aspect.c
branches/soc-2013-viewport_fx/source/blender/gpu/intern/gpu_basic_shader.c
branches/soc-2013-viewport_fx/source/blender/gpu/intern/gpu_common.c
branches/soc-2013-viewport_fx/source/blender/gpu/intern/gpu_draw.c
branches/soc-2013-viewport_fx/source/blender/gpu/intern/gpu_extensions.c
branches/soc-2013-viewport_fx/source/blender/gpu/intern/gpu_immediate_gl.c
branches/soc-2013-viewport_fx/source/blender/gpu/intern/gpu_immediate_inline.h
branches/soc-2013-viewport_fx/source/blender/gpu/intern/gpu_lighting.c
branches/soc-2013-viewport_fx/source/blender/gpu/intern/gpu_lighting.h
branches/soc-2013-viewport_fx/source/blender/gpu/intern/gpu_pixels.c
branches/soc-2013-viewport_fx/source/blender/gpu/intern/gpu_safety.h
branches/soc-2013-viewport_fx/source/blender/render/intern/source/voxeldata.c
branches/soc-2013-viewport_fx/source/blender/windowmanager/intern/wm_dragdrop.c
branches/soc-2013-viewport_fx/source/blender/windowmanager/intern/wm_draw.c
branches/soc-2013-viewport_fx/source/blender/windowmanager/intern/wm_operators.c
branches/soc-2013-viewport_fx/source/blender/windowmanager/wm.h
branches/soc-2013-viewport_fx/source/blender/windowmanager/wm_event_system.h
branches/soc-2013-viewport_fx/source/blender/windowmanager/wm_files.h
branches/soc-2013-viewport_fx/source/blender/windowmanager/wm_window.h
Modified: branches/soc-2013-viewport_fx/source/blender/blenfont/BLF_api.h
===================================================================
--- branches/soc-2013-viewport_fx/source/blender/blenfont/BLF_api.h
2013-08-04 19:40:50 UTC (rev 58911)
+++ branches/soc-2013-viewport_fx/source/blender/blenfont/BLF_api.h
2013-08-04 22:37:22 UTC (rev 58912)
@@ -32,6 +32,8 @@
#ifndef __BLF_API_H__
#define __BLF_API_H__
+#include <string.h> /* for size_t */
+
struct rctf;
struct ColorManagedDisplay;
Modified: branches/soc-2013-viewport_fx/source/blender/blenfont/intern/blf.c
===================================================================
--- branches/soc-2013-viewport_fx/source/blender/blenfont/intern/blf.c
2013-08-04 19:40:50 UTC (rev 58911)
+++ branches/soc-2013-viewport_fx/source/blender/blenfont/intern/blf.c
2013-08-04 22:37:22 UTC (rev 58912)
@@ -502,6 +502,10 @@
}
if (font->locked == 0) {
+ // SSS End
+ GPU_aspect_end();
+
+ // SSS Begin
GPU_aspect_begin(GPU_ASPECT_FONT, NULL);
if (font->shadow || font->blur) {
@@ -545,7 +549,11 @@
gpuImmediateUnformat();
- GPU_aspect_end(GPU_ASPECT_FONT, NULL);
+ // SSS End
+ GPU_aspect_end();
+
+ // SSS Begin
+ GPU_aspect_begin(GPU_ASPECT_BASIC, NULL);
}
}
Modified: branches/soc-2013-viewport_fx/source/blender/blenkernel/BKE_animsys.h
===================================================================
--- branches/soc-2013-viewport_fx/source/blender/blenkernel/BKE_animsys.h
2013-08-04 19:40:50 UTC (rev 58911)
+++ branches/soc-2013-viewport_fx/source/blender/blenkernel/BKE_animsys.h
2013-08-04 22:37:22 UTC (rev 58912)
@@ -110,7 +110,7 @@
int verify_paths);
/* Fix all the paths for the entire database... */
-void BKE_all_animdata_fix_paths_rename(ID *ref_id, const char *prefix, const
char *oldName, const char *newName);
+void BKE_all_animdata_fix_paths_rename(struct ID *ref_id, const char *prefix,
const char *oldName, const char *newName);
/* -------------------------------------- */
Modified: branches/soc-2013-viewport_fx/source/blender/blenkernel/BKE_brush.h
===================================================================
--- branches/soc-2013-viewport_fx/source/blender/blenkernel/BKE_brush.h
2013-08-04 19:40:50 UTC (rev 58911)
+++ branches/soc-2013-viewport_fx/source/blender/blenkernel/BKE_brush.h
2013-08-04 22:37:22 UTC (rev 58912)
@@ -76,9 +76,9 @@
float BKE_brush_curve_strength(struct Brush *br, float p, const float len); /*
used for sculpt */
/* sampling */
-float BKE_brush_sample_tex_3D(const Scene *scene, struct Brush *br, const
float point[3],
+float BKE_brush_sample_tex_3D(const struct Scene *scene, struct Brush *br,
const float point[3],
float rgba[4], const int thread, struct
ImagePool *pool);
-float BKE_brush_sample_masktex(const Scene *scene, struct Brush *br, const
float point[3],
+float BKE_brush_sample_masktex(const struct Scene *scene, struct Brush *br,
const float point[3],
const int thread, struct ImagePool *pool);
/* texture */
@@ -96,9 +96,9 @@
void BKE_brush_unprojected_radius_set(struct Scene *scene, struct Brush
*brush, float value);
float BKE_brush_alpha_get(const struct Scene *scene, struct Brush *brush);
-void BKE_brush_alpha_set(Scene *scene, struct Brush *brush, float alpha);
-float BKE_brush_weight_get(const Scene *scene, struct Brush *brush);
-void BKE_brush_weight_set(const Scene *scene, struct Brush *brush, float
value);
+void BKE_brush_alpha_set(struct Scene *scene, struct Brush *brush, float
alpha);
+float BKE_brush_weight_get(const struct Scene *scene, struct Brush *brush);
+void BKE_brush_weight_set(const struct Scene *scene, struct Brush *brush,
float value);
int BKE_brush_use_locked_size(const struct Scene *scene, struct Brush *brush);
int BKE_brush_use_alpha_pressure(const struct Scene *scene, struct Brush
*brush);
Modified: branches/soc-2013-viewport_fx/source/blender/blenkernel/BKE_global.h
===================================================================
--- branches/soc-2013-viewport_fx/source/blender/blenkernel/BKE_global.h
2013-08-04 19:40:50 UTC (rev 58911)
+++ branches/soc-2013-viewport_fx/source/blender/blenkernel/BKE_global.h
2013-08-04 22:37:22 UTC (rev 58912)
@@ -37,6 +37,8 @@
* for every fresh Blender run.
*/
+#include "BLI_sys_types.h" /* for bool */
+
#include "DNA_listBase.h"
#ifdef __cplusplus
Modified: branches/soc-2013-viewport_fx/source/blender/blenkernel/BKE_property.h
===================================================================
--- branches/soc-2013-viewport_fx/source/blender/blenkernel/BKE_property.h
2013-08-04 19:40:50 UTC (rev 58911)
+++ branches/soc-2013-viewport_fx/source/blender/blenkernel/BKE_property.h
2013-08-04 22:37:22 UTC (rev 58912)
@@ -31,6 +31,8 @@
* \ingroup bke
*/
+#include "DNA_property_types.h" /* for MAX_PROPSTRING */
+
struct bProperty;
struct ListBase;
struct Object;
Modified:
branches/soc-2013-viewport_fx/source/blender/blenkernel/intern/cdderivedmesh.c
===================================================================
---
branches/soc-2013-viewport_fx/source/blender/blenkernel/intern/cdderivedmesh.c
2013-08-04 19:40:50 UTC (rev 58911)
+++
branches/soc-2013-viewport_fx/source/blender/blenkernel/intern/cdderivedmesh.c
2013-08-04 22:37:22 UTC (rev 58912)
@@ -34,6 +34,19 @@
* \ingroup bke
*/
+/* my interface */
+#include "BKE_cdderivedmesh.h"
+
+/* my library */
+#include "BKE_pbvh.h"
+#include "BKE_global.h"
+#include "BKE_mesh.h"
+#include "BKE_paint.h"
+#include "BKE_editmesh.h"
+#include "BKE_curve.h"
+
+/* external */
+
#include "BLI_math.h"
#include "BLI_blenlib.h"
#include "BLI_edgehash.h"
@@ -43,14 +56,6 @@
#include "BLI_utildefines.h"
#include "BLI_scanfill.h"
-#include "BKE_pbvh.h"
-#include "BKE_cdderivedmesh.h"
-#include "BKE_global.h"
-#include "BKE_mesh.h"
-#include "BKE_paint.h"
-#include "BKE_editmesh.h"
-#include "BKE_curve.h"
-
#include "DNA_mesh_types.h"
#include "DNA_meshdata_types.h"
#include "DNA_object_types.h"
@@ -63,12 +68,15 @@
#include "GPU_extensions.h"
#include "GPU_material.h"
#include "GPU_compatibility.h"
-#include "GPU_simple_shader.h"
+#include "GPU_basic_shader.h"
+/* standard */
#include <string.h>
#include <limits.h>
#include <math.h>
+
+
extern GLubyte stipple_quarttone[128]; /* glutil.c, bad level data */
typedef struct {
@@ -393,7 +401,9 @@
int curpos = 0;
GPU_uvedge_setup(dm);
- gpuMatrixCommit();
+
+ GPU_commit_matrixes(); // XXX jwilkins: internal
interface
+
if (!GPU_buffer_legacy(dm)) {
for (i = 0; i < dm->numTessFaceData; i++, mf++)
{
if (!(mf->flag & ME_HIDE)) {
@@ -572,8 +582,6 @@
}
if (GPU_buffer_legacy(dm)) {
- uint32_t options = 0;
-
DEBUG_VBO("Using legacy code. cdDM_drawFacesSolid\n");
gpuImmediateFormat_N3_V3();
gpuBegin(glmode = GL_QUADS);
@@ -583,18 +591,19 @@
new_glmode = mface->v4 ? GL_QUADS : GL_TRIANGLES;
new_matnr = mface->mat_nr + 1;
new_shademodel = (mface->flag & ME_SMOOTH) ? GL_SMOOTH
: GL_FLAT;
-
+
if (new_glmode != glmode || new_matnr != matnr ||
new_shademodel != shademodel) {
gpuEnd();
drawCurrentMat = setMaterial(matnr = new_matnr,
NULL);
- if (shademodel != -1)
-
GPU_aspect_end(GPU_ASPECT_SIMPLE_SHADER, SET_UINT_IN_POINTER(options));
+ shademodel = new_shademodel;
- shademodel = new_shademodel;
- options = shademodel == GL_SMOOTH ? 0 :
GPU_SHADER_FLAT_SHADED;
- GPU_aspect_begin(GPU_ASPECT_SIMPLE_SHADER,
SET_UINT_IN_POINTER(options));
+ if (shademodel == GL_SMOOTH)
+ GPU_aspect_enable(GPU_ASPECT_BASIC,
GPU_BASIC_SMOOTH);
+ else
+ GPU_aspect_disable(GPU_ASPECT_BASIC,
GPU_BASIC_SMOOTH);
+
gpuBegin(glmode = new_glmode);
}
@@ -627,8 +636,8 @@
if (nors) nors += 3;
}
- if (dm->numTessFaceData > 0)
- GPU_aspect_end(GPU_ASPECT_SIMPLE_SHADER,
SET_UINT_IN_POINTER(options));
+ if (shademodel == GL_SMOOTH)
+ GPU_aspect_disable(GPU_ASPECT_BASIC, GPU_BASIC_SMOOTH);
gpuEnd();
gpuImmediateUnformat();
@@ -637,15 +646,21 @@
GPU_vertex_setup(dm);
GPU_normal_setup(dm);
if (!GPU_buffer_legacy(dm)) {
- uint32_t options = 0;
- GPU_aspect_begin(GPU_ASPECT_SIMPLE_SHADER,
SET_UINT_IN_POINTER(options)); // gpuShadeModel(GL_SMOOTH);
+
+ // SSS Enable
+ //gpuShadeModel(GL_SMOOTH);
+ GPU_aspect_enable(GPU_ASPECT_BASIC, GPU_BASIC_SMOOTH);
+
for (a = 0; a < dm->drawObject->totmaterial; a++) {
if
(setMaterial(dm->drawObject->materials[a].mat_nr + 1, NULL)) {
glDrawArrays(GL_TRIANGLES,
dm->drawObject->materials[a].start,
dm->drawObject->materials[a].totpoint);
}
}
- GPU_aspect_end(GPU_ASPECT_SIMPLE_SHADER,
SET_UINT_IN_POINTER(options)); // gpuShadeModel(GL_FLAT);
+
+ // SSS Disable
+ //gpuShadeModel(GL_FLAT);
+ GPU_aspect_disable(GPU_ASPECT_BASIC, GPU_BASIC_SMOOTH);
}
GPU_buffer_unbind();
}
@@ -667,7 +682,6 @@
MCol *mcol;
int i, orig;
int colType, startFace = 0;
- uint32_t options;
/* double lookup */
const int *index_mf_to_mpoly = dm->getTessFaceDataArray(dm,
CD_ORIGINDEX);
@@ -705,8 +719,9 @@
cdDM_update_normals_from_pbvh(dm);
- options = GPU_SHADER_TEXTURE_2D|GPU_SHADER_FLAT_SHADED; // XXX
jwilkins: not sure if in this context thingsa re suppose dto be flat shaded or
not.
- GPU_aspect_begin(GPU_ASPECT_SIMPLE_SHADER,
SET_UINT_IN_POINTER(options));
+ // SSS
+ GPU_aspect_enable(GPU_ASPECT_BASIC, GPU_BASIC_TEXTURE_2D);
+ GPU_aspect_disable(GPU_ASPECT_BASIC, GPU_BASIC_SMOOTH);
if (GPU_buffer_legacy(dm)) {
DEBUG_VBO("Using legacy code. cdDM_drawFacesTex_common\n");
@@ -815,9 +830,9 @@
int tottri = dm->drawObject->tot_triangle_point / 3;
int next_actualFace =
dm->drawObject->triangle_to_mface[0];
- GPU_aspect_end(GPU_ASPECT_SIMPLE_SHADER,
SET_UINT_IN_POINTER(options)); // gpuShadeModel(GL_FLAT);
- options = GPU_SHADER_TEXTURE_2D;
- GPU_aspect_begin(GPU_ASPECT_SIMPLE_SHADER,
SET_UINT_IN_POINTER(options)); // gpuShadeModel(GL_SMOOTH);
+ // SSS Enable
+ //gpuShadeModel(GL_SMOOTH);
+ GPU_aspect_enable(GPU_ASPECT_BASIC, GPU_BASIC_SMOOTH);
/* lastFlag = 0; */ /* UNUSED */
for (i = 0; i < tottri; i++) {
@@ -877,7 +892,8 @@
}
}
- GPU_aspect_end(GPU_ASPECT_TEXTURE,
SET_UINT_IN_POINTER(options));
+ // SSS
+ GPU_aspect_disable(GPU_ASPECT_BASIC,
GPU_BASIC_TEXTURE_2D|GPU_BASIC_SMOOTH);
GPU_buffer_unbind();
}
@@ -958,9 +974,10 @@
@@ Diff output truncated at 10240 characters. @@
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
