Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
godot
Project
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
community
godot
Commits
fccf2816
Commit
fccf2816
authored
Apr 09, 2017
by
Juan Linietsky
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
-Fix eternal black screen on Windows
-Disabled warnings on windows, need to properly set up warnings
parent
2cca9b06
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
10 additions
and
6 deletions
+10
-6
SConstruct
SConstruct
+1
-1
rasterizer_storage_gles3.cpp
drivers/gles3/rasterizer_storage_gles3.cpp
+1
-1
editor_node.cpp
editor/editor_node.cpp
+3
-3
detect.py
platform/windows/detect.py
+1
-1
rasterizer.h
servers/visual/rasterizer.h
+1
-0
visual_server_canvas.cpp
servers/visual/visual_server_canvas.cpp
+3
-0
No files found.
SConstruct
View file @
fccf2816
...
...
@@ -275,7 +275,7 @@ if selected_platform in platform_list:
# TODO: Add support to specify different levels of warning, e.g. only critical/significant, instead of on/off
if
(
env
[
"warnings"
]
==
"yes"
):
if
(
os
.
name
==
"nt"
and
os
.
getenv
(
"VSINSTALLDIR"
)):
# MSVC, needs to stand out of course
env
.
Append
(
CCFLAGS
=
[
'/W4
'
])
pass
# env.Append(CCFLAGS=['/W2
'])
else
:
# Rest of the world
env
.
Append
(
CCFLAGS
=
[
'-Wall'
])
else
:
...
...
drivers/gles3/rasterizer_storage_gles3.cpp
View file @
fccf2816
...
...
@@ -5533,7 +5533,7 @@ void RasterizerStorageGLES3::_render_target_allocate(RenderTarget *rt) {
glGenTextures
(
1
,
&
rt
->
depth
);
glBindTexture
(
GL_TEXTURE_2D
,
rt
->
depth
);
glTexImage2D
(
GL_TEXTURE_2D
,
0
,
GL_DEPTH
_COMPONENT24
,
rt
->
width
,
rt
->
height
,
0
,
glTexImage2D
(
GL_TEXTURE_2D
,
0
,
GL_DEPTH
24_STENCIL8
,
rt
->
width
,
rt
->
height
,
0
,
GL_DEPTH_COMPONENT
,
GL_UNSIGNED_INT
,
NULL
);
glTexParameteri
(
GL_TEXTURE_2D
,
GL_TEXTURE_MAG_FILTER
,
GL_NEAREST
);
glTexParameteri
(
GL_TEXTURE_2D
,
GL_TEXTURE_MIN_FILTER
,
GL_NEAREST
);
...
...
editor/editor_node.cpp
View file @
fccf2816
...
...
@@ -4862,9 +4862,9 @@ EditorNode::EditorNode() {
import_wav
.
instance
();
ResourceFormatImporter
::
get_singleton
()
->
add_importer
(
import_wav
);
Ref
<
ResourceImporterOBJ
>
import_obj
;
import_obj
.
instance
();
ResourceFormatImporter
::
get_singleton
()
->
add_importer
(
import_obj
);
//
Ref<ResourceImporterOBJ> import_obj;
//
import_obj.instance();
//
ResourceFormatImporter::get_singleton()->add_importer(import_obj);
Ref
<
ResourceImporterScene
>
import_scene
;
import_scene
.
instance
();
...
...
platform/windows/detect.py
View file @
fccf2816
...
...
@@ -242,7 +242,7 @@ def configure(env):
env
.
Append
(
LINKFLAGS
=
[
'/SUBSYSTEM:CONSOLE'
])
env
.
Append
(
LINKFLAGS
=
[
'/DEBUG'
])
env
.
Append
(
CCFLAGS
=
[
'/MT'
,
'/Gd'
,
'/GR'
,
'/nologo'
])
env
.
Append
(
CCFLAGS
=
[
'/MT'
,
'/Gd'
,
'/GR'
,
'/nologo'
])
env
.
Append
(
CXXFLAGS
=
[
'/TP'
])
env
.
Append
(
CPPFLAGS
=
[
'/DMSVC'
,
'/GR'
,
])
env
.
Append
(
CCFLAGS
=
[
'/I'
+
os
.
getenv
(
"WindowsSdkDir"
)
+
"/Include"
])
...
...
servers/visual/rasterizer.h
View file @
fccf2816
...
...
@@ -886,6 +886,7 @@ public:
};
virtual
void
canvas_begin
()
=
0
;
virtual
void
canvas_end
()
=
0
;
virtual
void
canvas_render_items
(
Item
*
p_item_list
,
int
p_z
,
const
Color
&
p_modulate
,
Light
*
p_light
)
=
0
;
virtual
void
canvas_debug_viewport_shadows
(
Light
*
p_lights_with_shadow
)
=
0
;
...
...
servers/visual/visual_server_canvas.cpp
View file @
fccf2816
...
...
@@ -231,6 +231,9 @@ void VisualServerCanvas::render_canvas(Canvas *p_canvas, const Transform2D &p_tr
}
}
}
VSG
::
canvas_render
->
canvas_end
();
}
RID
VisualServerCanvas
::
canvas_create
()
{
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment