mirror of
https://github.com/cocos/cocos4.git
synced 2026-11-20 23:52:40 +08:00
fix program error on mac
This commit is contained in:
@@ -21,7 +21,6 @@
|
||||
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
|
||||
THE SOFTWARE.
|
||||
****************************************************************************/
|
||||
|
||||
#include "ProgramLib.h"
|
||||
#include "../gfx/Program.h"
|
||||
#include "gfx/DeviceGraphics.h"
|
||||
@@ -211,27 +210,55 @@ void ProgramLib::define(const std::string& name, const std::string& vert, const
|
||||
|
||||
std::string newVert = vert;
|
||||
std::string newFrag = frag;
|
||||
|
||||
std::size_t begin = newVert.find(_precisionReplace);
|
||||
if (begin != std::string::npos)
|
||||
|
||||
#if (CC_TARGET_PLATFORM == CC_PLATFORM_WIN32) || (CC_TARGET_PLATFORM == CC_PLATFORM_MAC) || (CC_TARGET_PLATFORM == CC_PLATFORM_LINUX)
|
||||
std::string::size_type pos = 0;
|
||||
pos = newVert.find(_precisionVert);
|
||||
if (pos != std::string::npos)
|
||||
{
|
||||
newVert.replace(begin, strlen(_precisionReplace), _precision);
|
||||
}
|
||||
else
|
||||
{
|
||||
newVert = _precision + vert;
|
||||
newVert.replace(pos, strlen(_precisionVert), "");
|
||||
}
|
||||
|
||||
begin = newFrag.find(_precisionReplace);
|
||||
if (begin != std::string::npos)
|
||||
pos = newFrag.find(_precisionFrag);
|
||||
if (pos != std::string::npos)
|
||||
{
|
||||
newFrag.replace(begin, strlen(_precisionReplace), _precision);
|
||||
newFrag.replace(pos, strlen(_precisionFrag), "");
|
||||
}
|
||||
else
|
||||
|
||||
while((pos = newVert.find(_mediump)) != std::string::npos)
|
||||
{
|
||||
newFrag = _precision + frag;
|
||||
newVert.replace(pos, strlen(_mediump), _mediumpReplace);
|
||||
}
|
||||
|
||||
while((pos = newFrag.find(_mediump)) != std::string::npos)
|
||||
{
|
||||
newFrag.replace(pos, strlen(_mediump), _mediumpReplace);
|
||||
}
|
||||
|
||||
while((pos = newVert.find(_lowp)) != std::string::npos)
|
||||
{
|
||||
newVert.replace(pos, strlen(_lowp), _lowpReplace);
|
||||
}
|
||||
|
||||
while((pos = newFrag.find(_lowp)) != std::string::npos)
|
||||
{
|
||||
newFrag.replace(pos, strlen(_lowp), _lowpReplace);
|
||||
}
|
||||
#else
|
||||
std::string::size_type pos = 0;
|
||||
pos = newVert.find(_precisionVert);
|
||||
if (pos == std::string::npos)
|
||||
{
|
||||
newVert = _precisionVertReplace + vert;
|
||||
}
|
||||
|
||||
pos = newVert.find(_precisionFrag);
|
||||
if (pos == std::string::npos)
|
||||
{
|
||||
newFrag = _precisionFragReplace + frag;
|
||||
}
|
||||
#endif
|
||||
|
||||
// store it
|
||||
auto& templ = _templates[name];
|
||||
templ.id = id;
|
||||
|
||||
@@ -90,8 +90,15 @@ private:
|
||||
|
||||
private:
|
||||
DeviceGraphics* _device = nullptr;
|
||||
const char* _precisionReplace = "precision highp float;";
|
||||
const char* _precision = "#ifdef GL_ES\nprecision highp float;\n#endif\n";
|
||||
const char* _precisionVert = "precision highp float;";
|
||||
const char* _precisionVertReplace = "#ifdef GL_ES\nprecision highp float;\n#endif\n";
|
||||
const char* _precisionFrag = "precision highp float;";
|
||||
const char* _precisionFragReplace = "#ifdef GL_ES\nprecision mediump float;\n#endif\n";
|
||||
const char* _mediumpReplace = "half";
|
||||
const char* _mediump = "mediump";
|
||||
const char* _lowpReplace = "fixed";
|
||||
const char* _lowp = "lowp";
|
||||
|
||||
std::unordered_map<std::string, Template> _templates;
|
||||
std::unordered_map<std::string, Program*> _cache;
|
||||
};
|
||||
|
||||
@@ -8,20 +8,6 @@ var renderer = renderer || {};
|
||||
*/
|
||||
renderer.ProgramLib = {
|
||||
|
||||
/**
|
||||
* @method getProgram
|
||||
* @param {String} arg0
|
||||
* @param {Array} arg1
|
||||
* @return {cc.renderer::Program}
|
||||
*/
|
||||
getProgram : function (
|
||||
str,
|
||||
map
|
||||
)
|
||||
{
|
||||
return cc.renderer::Program;
|
||||
},
|
||||
|
||||
/**
|
||||
* @method define
|
||||
* @param {String} arg0
|
||||
@@ -38,34 +24,6 @@ array
|
||||
{
|
||||
},
|
||||
|
||||
/**
|
||||
* @method getValueFromDefineList
|
||||
* @param {String} arg0
|
||||
* @param {Array} arg1
|
||||
* @return {cc.Value}
|
||||
*/
|
||||
getValueFromDefineList : function (
|
||||
str,
|
||||
map
|
||||
)
|
||||
{
|
||||
return cc.Value;
|
||||
},
|
||||
|
||||
/**
|
||||
* @method getKey
|
||||
* @param {String} arg0
|
||||
* @param {Array} arg1
|
||||
* @return {String}
|
||||
*/
|
||||
getKey : function (
|
||||
str,
|
||||
map
|
||||
)
|
||||
{
|
||||
return ;
|
||||
},
|
||||
|
||||
/**
|
||||
* @method ProgramLib
|
||||
* @constructor
|
||||
|
||||
@@ -8,29 +8,6 @@
|
||||
se::Object* __jsb_cocos2d_renderer_ProgramLib_proto = nullptr;
|
||||
se::Class* __jsb_cocos2d_renderer_ProgramLib_class = nullptr;
|
||||
|
||||
static bool js_renderer_ProgramLib_getProgram(se::State& s)
|
||||
{
|
||||
cocos2d::renderer::ProgramLib* cobj = (cocos2d::renderer::ProgramLib*)s.nativeThisObject();
|
||||
SE_PRECONDITION2(cobj, false, "js_renderer_ProgramLib_getProgram : Invalid Native Object");
|
||||
const auto& args = s.args();
|
||||
size_t argc = args.size();
|
||||
CC_UNUSED bool ok = true;
|
||||
if (argc == 2) {
|
||||
std::string arg0;
|
||||
std::vector<std::unordered_map<std::string, cocos2d::Value>*> arg1;
|
||||
ok &= seval_to_std_string(args[0], &arg0);
|
||||
ok &= seval_to_native_ptr(args[1], &arg1);
|
||||
SE_PRECONDITION2(ok, false, "js_renderer_ProgramLib_getProgram : Error processing arguments");
|
||||
cocos2d::renderer::Program* result = cobj->getProgram(arg0, arg1);
|
||||
ok &= native_ptr_to_seval<cocos2d::renderer::Program>((cocos2d::renderer::Program*)result, &s.rval());
|
||||
SE_PRECONDITION2(ok, false, "js_renderer_ProgramLib_getProgram : Error processing arguments");
|
||||
return true;
|
||||
}
|
||||
SE_REPORT_ERROR("wrong number of arguments: %d, was expecting %d", (int)argc, 2);
|
||||
return false;
|
||||
}
|
||||
SE_BIND_FUNC(js_renderer_ProgramLib_getProgram)
|
||||
|
||||
static bool js_renderer_ProgramLib_define(se::State& s)
|
||||
{
|
||||
cocos2d::renderer::ProgramLib* cobj = (cocos2d::renderer::ProgramLib*)s.nativeThisObject();
|
||||
@@ -56,52 +33,6 @@ static bool js_renderer_ProgramLib_define(se::State& s)
|
||||
}
|
||||
SE_BIND_FUNC(js_renderer_ProgramLib_define)
|
||||
|
||||
static bool js_renderer_ProgramLib_getValueFromDefineList(se::State& s)
|
||||
{
|
||||
cocos2d::renderer::ProgramLib* cobj = (cocos2d::renderer::ProgramLib*)s.nativeThisObject();
|
||||
SE_PRECONDITION2(cobj, false, "js_renderer_ProgramLib_getValueFromDefineList : Invalid Native Object");
|
||||
const auto& args = s.args();
|
||||
size_t argc = args.size();
|
||||
CC_UNUSED bool ok = true;
|
||||
if (argc == 2) {
|
||||
std::string arg0;
|
||||
std::vector<std::unordered_map<std::string, cocos2d::Value>*> arg1;
|
||||
ok &= seval_to_std_string(args[0], &arg0);
|
||||
ok &= seval_to_native_ptr(args[1], &arg1);
|
||||
SE_PRECONDITION2(ok, false, "js_renderer_ProgramLib_getValueFromDefineList : Error processing arguments");
|
||||
cocos2d::Value result = cobj->getValueFromDefineList(arg0, arg1);
|
||||
ok &= ccvalue_to_seval(result, &s.rval());
|
||||
SE_PRECONDITION2(ok, false, "js_renderer_ProgramLib_getValueFromDefineList : Error processing arguments");
|
||||
return true;
|
||||
}
|
||||
SE_REPORT_ERROR("wrong number of arguments: %d, was expecting %d", (int)argc, 2);
|
||||
return false;
|
||||
}
|
||||
SE_BIND_FUNC(js_renderer_ProgramLib_getValueFromDefineList)
|
||||
|
||||
static bool js_renderer_ProgramLib_getKey(se::State& s)
|
||||
{
|
||||
cocos2d::renderer::ProgramLib* cobj = (cocos2d::renderer::ProgramLib*)s.nativeThisObject();
|
||||
SE_PRECONDITION2(cobj, false, "js_renderer_ProgramLib_getKey : Invalid Native Object");
|
||||
const auto& args = s.args();
|
||||
size_t argc = args.size();
|
||||
CC_UNUSED bool ok = true;
|
||||
if (argc == 2) {
|
||||
std::string arg0;
|
||||
std::vector<std::unordered_map<std::string, cocos2d::Value>*> arg1;
|
||||
ok &= seval_to_std_string(args[0], &arg0);
|
||||
ok &= seval_to_native_ptr(args[1], &arg1);
|
||||
SE_PRECONDITION2(ok, false, "js_renderer_ProgramLib_getKey : Error processing arguments");
|
||||
std::string result = cobj->getKey(arg0, arg1);
|
||||
ok &= std_string_to_seval(result, &s.rval());
|
||||
SE_PRECONDITION2(ok, false, "js_renderer_ProgramLib_getKey : Error processing arguments");
|
||||
return true;
|
||||
}
|
||||
SE_REPORT_ERROR("wrong number of arguments: %d, was expecting %d", (int)argc, 2);
|
||||
return false;
|
||||
}
|
||||
SE_BIND_FUNC(js_renderer_ProgramLib_getKey)
|
||||
|
||||
SE_DECLARE_FINALIZE_FUNC(js_cocos2d_renderer_ProgramLib_finalize)
|
||||
|
||||
static bool js_renderer_ProgramLib_constructor(se::State& s)
|
||||
@@ -141,10 +72,7 @@ bool js_register_renderer_ProgramLib(se::Object* obj)
|
||||
{
|
||||
auto cls = se::Class::create("ProgramLib", obj, nullptr, _SE(js_renderer_ProgramLib_constructor));
|
||||
|
||||
cls->defineFunction("getProgram", _SE(js_renderer_ProgramLib_getProgram));
|
||||
cls->defineFunction("define", _SE(js_renderer_ProgramLib_define));
|
||||
cls->defineFunction("getValueFromDefineList", _SE(js_renderer_ProgramLib_getValueFromDefineList));
|
||||
cls->defineFunction("getKey", _SE(js_renderer_ProgramLib_getKey));
|
||||
cls->defineFinalizeFunction(_SE(js_cocos2d_renderer_ProgramLib_finalize));
|
||||
cls->install();
|
||||
JSBClassType::registerClass<cocos2d::renderer::ProgramLib>(cls);
|
||||
|
||||
@@ -9,10 +9,7 @@ extern se::Class* __jsb_cocos2d_renderer_ProgramLib_class;
|
||||
|
||||
bool js_register_cocos2d_renderer_ProgramLib(se::Object* obj);
|
||||
bool register_all_renderer(se::Object* obj);
|
||||
SE_DECLARE_FUNC(js_renderer_ProgramLib_getProgram);
|
||||
SE_DECLARE_FUNC(js_renderer_ProgramLib_define);
|
||||
SE_DECLARE_FUNC(js_renderer_ProgramLib_getValueFromDefineList);
|
||||
SE_DECLARE_FUNC(js_renderer_ProgramLib_getKey);
|
||||
SE_DECLARE_FUNC(js_renderer_ProgramLib_ProgramLib);
|
||||
|
||||
extern se::Object* __jsb_cocos2d_renderer_CustomProperties_proto;
|
||||
|
||||
@@ -62,7 +62,8 @@ skip = RenderFlow::[calculateWorldMatrix insertNodeLevel visit calculateLocalMa
|
||||
CustomProperties::[extractProperties extractDefines getHash getDefine getProperty setProperty],
|
||||
AssemblerSprite::[fillBuffers calculateWorldVertices generateWorldVertices],
|
||||
SimpleSprite2D::[generateWorldVertices],
|
||||
SlicedSprite2D::[generateWorldVertices]
|
||||
SlicedSprite2D::[generateWorldVertices],
|
||||
ProgramLib::[getProgram getKey getValueFromDefineList]
|
||||
rename_classes = BaseRenderer::Base,
|
||||
Effect::EffectNative,
|
||||
Pass::PassNative
|
||||
|
||||
Reference in New Issue
Block a user